You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/11/03 16:19:42 UTC

[1/2] kylin git commit: project level acl

Repository: kylin
Updated Branches:
  refs/heads/document 52932cf0e -> b05979700


project level acl


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

Branch: refs/heads/document
Commit: 5a152c8fce1246411e486360074a8f415ced92f3
Parents: 52932cf
Author: lidongsjtu <li...@apache.org>
Authored: Fri Nov 3 23:29:17 2017 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Fri Nov 3 23:29:17 2017 +0800

----------------------------------------------------------------------
 website/_docs21/index.cn.md                   |   6 +-
 website/_docs21/index.md                      |   1 +
 website/_docs21/tutorial/acl.md               |   7 ++-
 website/_docs21/tutorial/project_level_acl.md |  62 +++++++++++++++++++++
 website/images/Project-level-acl/ACL-1.png    | Bin 0 -> 11742 bytes
 website/images/Project-level-acl/ACL-2.png    | Bin 0 -> 57688 bytes
 website/images/Project-level-acl/ACL-3.png    | Bin 0 -> 38965 bytes
 7 files changed, 73 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/5a152c8f/website/_docs21/index.cn.md
----------------------------------------------------------------------
diff --git a/website/_docs21/index.cn.md b/website/_docs21/index.cn.md
index eb14dfb..76152cc 100644
--- a/website/_docs21/index.cn.md
+++ b/website/_docs21/index.cn.md
@@ -12,8 +12,10 @@ permalink: /cn/docs21/index.html
 Apache Kylin™是一个开源的分布式分析引擎,提供Hadoop之上的SQL查询接口及多维分析(OLAP)能力以支持超大规模数据,最初由eBay Inc.开发并贡献至开源社区。
 
 查看旧版本文档: 
-* [v2.0](/cn/docs20/)
-* [v1.6](/cn/docs16/)
+* [v2.1.x and v2.2.x document](/docs21/)
+* [v2.0.x document](/docs20/)
+* [v1.6.x document](/docs16/)
+* [v1.5.x document](/docs15/)
 
 安装 
 ------------  

http://git-wip-us.apache.org/repos/asf/kylin/blob/5a152c8f/website/_docs21/index.md
----------------------------------------------------------------------
diff --git a/website/_docs21/index.md b/website/_docs21/index.md
index 5515cac..46063c0 100644
--- a/website/_docs21/index.md
+++ b/website/_docs21/index.md
@@ -13,6 +13,7 @@ Apache Kylin™ is an open source Distributed Analytics Engine designed to provi
 
 Document of prior versions: 
 
+* [v2.1.x and v2.2.x document](/docs21/)
 * [v2.0.x document](/docs20/)
 * [v1.6.x document](/docs16/)
 * [v1.5.x document](/docs15/)

http://git-wip-us.apache.org/repos/asf/kylin/blob/5a152c8f/website/_docs21/tutorial/acl.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/acl.md b/website/_docs21/tutorial/acl.md
index 0485e94..b05d7ac 100644
--- a/website/_docs21/tutorial/acl.md
+++ b/website/_docs21/tutorial/acl.md
@@ -1,11 +1,16 @@
 ---
 layout: docs21
-title: Cube Permission
+title: Cube Permission (v2.1.x)
 categories: tutorial
 permalink: /docs21/tutorial/acl.html
 since: v0.7.1
 ---
 
+```
+Notes:
+Cube ACL is removed since v2.2.0, please use ![Project level ACL](/docs21/tutorial/project_level_acl.html) to manager ACL.
+```
+
 In `Cubes` page, double click the cube row to see the detail information. Here we focus on the `Access` tab.
 Click the `+Grant` button to grant permission. 
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/5a152c8f/website/_docs21/tutorial/project_level_acl.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/project_level_acl.md b/website/_docs21/tutorial/project_level_acl.md
new file mode 100644
index 0000000..cce9a2b
--- /dev/null
+++ b/website/_docs21/tutorial/project_level_acl.md
@@ -0,0 +1,62 @@
+---
+layout: docs21
+title: Project Level ACL
+categories: tutorial
+permalink: /docs21/tutorial/project_level_acl.html
+since: v2.1.0
+---
+
+Whether a user can access a project and use some functionalities within the project is determined by project-level access control, there are four types of access permission role set at the project-level in Apache Kylin. They are *ADMIN*, *MANAGEMENT*, *OPERATION* and *QUERY*. Each role defines a list of functionality user may perform in Apache Kylin.
+
+- *QUERY*: designed to be used by analysts who only need access permission to query tables/cubes in the project.
+- *OPERATION*: designed to be used by operation team in a corporate/organization who need permission to maintain the Cube. OPERATION access permission includes QUERY.
+- *MANAGEMENT*: designed to be used by Modeler or Designer who is fully knowledgeable of business meaning of the data/model, Cube will be in charge of Model and Cube design. MANAGEMENT access permission includes OPERATION, and QUERY.
+- *ADMIN*: Designed to fully manage the project. ADMIN access permission includes MANAGEMENT, OPERATION and QUERY.
+
+Access permissions are independent between different projects.
+
+### How Access Permission is Determined
+
+Once project-level access permission has been set for a user, access permission on data source, model and Cube will be inherited based on the access permission role defined on project-level. For detailed functionalities, each access permission role can have access to, see table below.
+
+|                                          | System Admin | Project Admin | Management | Operation | Query |
+| ---------------------------------------- | ------------ | ------------- | ---------- | --------- | ----- |
+| Create/delete project                    | Yes          | No            | No         | No        | No    |
+| Edit project                             | Yes          | Yes           | No         | No        | No    |
+| Add/edit/delete project access permission | Yes          | Yes           | No         | No        | No    |
+| Check model page                         | Yes          | Yes           | Yes        | Yes       | Yes   |
+| Check data source page                   | Yes          | Yes           | Yes        | No        | No    |
+| Load, unload table, reload table         | Yes          | Yes           | No         | No        | No    |
+| View model in read only mode             | Yes          | Yes           | Yes        | Yes       | Yes   |
+| Add, edit, clone, drop model             | Yes          | Yes           | Yes        | No        | No    |
+| Check cube detail definition             | Yes          | Yes           | Yes        | Yes       | Yes   |
+| Add, disable/enable, clone cube, edit, drop cube, purge cube | Yes          | Yes           | Yes        | No        | No    |
+| Build, refresh, merge cube               | Yes          | Yes           | Yes        | Yes       | No    |
+| Edit, view cube json                     | Yes          | Yes           | Yes        | No        | No    |
+| Check insight page                       | Yes          | Yes           | Yes        | Yes       | Yes   |
+| View table in insight page               | Yes          | Yes           | Yes        | Yes       | Yes   |
+| Check monitor page                       | Yes          | Yes           | Yes        | Yes       | No    |
+| Check system page                        | Yes          | No            | No         | No        | No    |
+| Reload metadata, disable cache, set config, diagnosis | Yes          | No            | No         | No        | No    |
+
+Additionally, when Query Pushdown is enabled, QUERY access permission on a project allows users to issue push down queries on all tables in the project even though no cube could serve them. It's impossible if a user is not yet granted QUERY permission at project-level.
+
+### Manage Access Permission at Project-level
+
+1. Click the small gear shape icon on the top-left corner of Model page. You will be redirected to project page
+
+   ![](/images/Project-level-acl/ACL-1.png)
+
+2. In project page, expand a project and choose Access.
+3. Click `Grant`to grant permission to user.
+
+	![](/images/Project-level-acl/ACL-2.png)
+
+4. Fill in name of the user or role, choose permission and then click `Grant` to grant permission.
+
+5. You can also revoke and update permission on this page.
+
+   ![](/images/Project-level-acl/ACL-3.png)
+
+   Please note that in order to grant permission to default user (MODELER and ANLAYST), these users need to login as least once. 
+   ​
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/kylin/blob/5a152c8f/website/images/Project-level-acl/ACL-1.png
----------------------------------------------------------------------
diff --git a/website/images/Project-level-acl/ACL-1.png b/website/images/Project-level-acl/ACL-1.png
new file mode 100644
index 0000000..f1ae976
Binary files /dev/null and b/website/images/Project-level-acl/ACL-1.png differ

http://git-wip-us.apache.org/repos/asf/kylin/blob/5a152c8f/website/images/Project-level-acl/ACL-2.png
----------------------------------------------------------------------
diff --git a/website/images/Project-level-acl/ACL-2.png b/website/images/Project-level-acl/ACL-2.png
new file mode 100644
index 0000000..0d7e0b5
Binary files /dev/null and b/website/images/Project-level-acl/ACL-2.png differ

http://git-wip-us.apache.org/repos/asf/kylin/blob/5a152c8f/website/images/Project-level-acl/ACL-3.png
----------------------------------------------------------------------
diff --git a/website/images/Project-level-acl/ACL-3.png b/website/images/Project-level-acl/ACL-3.png
new file mode 100644
index 0000000..4f10e1b
Binary files /dev/null and b/website/images/Project-level-acl/ACL-3.png differ


[2/2] kylin git commit: release v2.2.0

Posted by li...@apache.org.
release v2.2.0


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

Branch: refs/heads/document
Commit: b0597970094987aae64ecfa0f5efdca9d27f5d97
Parents: 5a152c8
Author: lidongsjtu <li...@apache.org>
Authored: Sat Nov 4 00:19:34 2017 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Sat Nov 4 00:19:34 2017 +0800

----------------------------------------------------------------------
 website/_docs21/release_notes.md   | 93 ++++++++++++++++++++++++++++++++-
 website/_docs21/tutorial/acl.cn.md |  2 +-
 website/_docs21/tutorial/acl.md    |  2 +-
 website/download/index.cn.md       | 23 ++++----
 website/download/index.md          | 21 +++-----
 5 files changed, 111 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/b0597970/website/_docs21/release_notes.md
----------------------------------------------------------------------
diff --git a/website/_docs21/release_notes.md b/website/_docs21/release_notes.md
index 7780068..d4bfa87 100644
--- a/website/_docs21/release_notes.md
+++ b/website/_docs21/release_notes.md
@@ -15,10 +15,99 @@ or send to Apache Kylin mailing list:
 * User relative: [user@kylin.apache.org](mailto:user@kylin.apache.org)
 * Development relative: [dev@kylin.apache.org](mailto:dev@kylin.apache.org)
 
+## v2.2.0 - 2017-11-03
+
+_Tag:_ [kylin-2.2.0](https://github.com/apache/kylin/tree/kylin-2.2.0)
+This is a major release after 2.1, with more than 70 bug fixes and enhancements. Check [How to upgrade](/docs21/howto/howto_upgrade.html).
+
+__New Feature__
+* [KYLIN-2703] - Manage ACL through Apache Ranger
+* [KYLIN-2752] - Make HTable name prefix configurable
+* [KYLIN-2761] - Table Level ACL
+* [KYLIN-2775] - Streaming Cube Sample
+
+__Improvement__
+* [KYLIN-2535] - Use ResourceStore to manage ACL files
+* [KYLIN-2604] - Use global dict as the default encoding for precise distinct count in web
+* [KYLIN-2606] - Only return counter for precise count_distinct if query is exactAggregate
+* [KYLIN-2622] - AppendTrieDictionary support not global
+* [KYLIN-2623] - Move output(Hbase) related code from MR engine to outputside
+* [KYLIN-2653] - Spark Cubing read metadata from HDFS
+* [KYLIN-2717] - Move concept Table under Project
+* [KYLIN-2790] - Add an extending point to support other types of column family
+* [KYLIN-2795] - Improve REST API document, add get/list jobs
+* [KYLIN-2803] - Pushdown non "select" query
+* [KYLIN-2818] - Refactor dateRange & sourceOffset on CubeSegment
+* [KYLIN-2819] - Add "kylin.env.zookeeper-base-path" for zk path
+* [KYLIN-2823] - Trim TupleFilter after dictionary-based filter optimization
+* [KYLIN-2844] - Override "max-visit-scanrange" and "max-fuzzykey-scan" at cube level
+* [KYLIN-2854] - Remove duplicated controllers
+* [KYLIN-2856] - Log pushdown query as a kind of BadQuery
+* [KYLIN-2857] - MR configuration should be overwritten by user specified parameters when resuming MR jobs
+* [KYLIN-2858] - Add retry in cache sync
+* [KYLIN-2879] - Upgrade Spring & Spring Security to fix potential vulnerability
+* [KYLIN-2891] - Upgrade Tomcat to 7.0.82.
+* [KYLIN-2963] - Remove Beta for Spark Cubing
+
+__Bug__
+* [KYLIN-1794] - Enable job list even some job metadata parsing failed
+* [KYLIN-2600] - Incorrectly set the range start when filtering by the minimum value
+* [KYLIN-2705] - Allow removing model's "partition_date_column" on web
+* [KYLIN-2706] - Fix the bug for the comparator in SortedIteratorMergerWithLimit
+* [KYLIN-2707] - Fix NPE in JobInfoConverter
+* [KYLIN-2716] - Non-thread-safe WeakHashMap leading to high CPU
+* [KYLIN-2718] - Overflow when calculating combination amount based on static rules
+* [KYLIN-2753] - Job duration may become negative
+* [KYLIN-2766] - Kylin uses default FS to put the coprocessor jar, instead of the working dir
+* [KYLIN-2773] - Should not push down join condition related columns are compatible while not consistent
+* [KYLIN-2781] - Make 'find-hadoop-conf-dir.sh' executable
+* [KYLIN-2786] - Miss "org.apache.kylin.source.kafka.DateTimeParser"
+* [KYLIN-2788] - HFile is not written to S3
+* [KYLIN-2789] - Cube's last build time is wrong
+* [KYLIN-2791] - Fix bug in readLong function in BytesUtil
+* [KYLIN-2798] - Can't rearrange the order of rowkey columns though web UI
+* [KYLIN-2799] - Building cube with percentile measure encounter with NullPointerException
+* [KYLIN-2800] - All dictionaries should be built based on the flat hive table
+* [KYLIN-2806] - Empty results from JDBC with Date filter in prepareStatement
+* [KYLIN-2812] - Save to wrong database when loading Kafka Topic
+* [KYLIN-2814] - HTTP connection may not be released in RestClient
+* [KYLIN-2815] - Empty results with prepareStatement but OK with KylinStatement
+* [KYLIN-2824] - Parse Boolean type in JDBC driver
+* [KYLIN-2832] - Table meta missing from system diagnosis
+* [KYLIN-2833] - Storage cleanup job could delete the intermediate hive table used by running jobs
+* [KYLIN-2834] - Bug in metadata sync, Broadcaster lost listener after cache wipe
+* [KYLIN-2838] - Should get storageType in changeHtableHost of CubeMigrationCLI
+* [KYLIN-2862] - BasicClientConnManager in RestClient can't do well with syncing many query severs
+* [KYLIN-2863] - Double caret bug in sample.sh for old version bash
+* [KYLIN-2865] - Wrong fs when use two cluster
+* [KYLIN-2868] - Include and exclude filters not work on ResourceTool
+* [KYLIN-2870] - Shortcut key description is error at Kylin-Web
+* [KYLIN-2871] - Ineffective null check in SegmentRange
+* [KYLIN-2877] - Unclosed PreparedStatement in QueryService#execute()
+* [KYLIN-2906] - Check model/cube name is duplicated when creating model/cube
+* [KYLIN-2915] - Exception during query on lookup table
+* [KYLIN-2920] - Failed to get streaming config on WebUI
+* [KYLIN-2944] - HLLCSerializer, RawSerializer, PercentileSerializer returns shared object in serialize()
+* [KYLIN-2949] - Couldn't get authorities with LDAP in RedHat Linux
+
+
+Task
+* [KYLIN-2782] - Replace DailyRollingFileAppender with RollingFileAppender to allow log retention
+* [KYLIN-2925] - Provide document for Ranger security integration
+
+Sub-task
+* [KYLIN-2549] - Modify tools that related to Acl
+* [KYLIN-2728] - Introduce a new cuboid scheduler based on cuboid tree rather than static rules
+* [KYLIN-2729] - Introduce greedy algorithm for cube planner
+* [KYLIN-2730] - Introduce genetic algorithm for cube planner
+* [KYLIN-2802] - Enable cube planner phase one
+* [KYLIN-2826] - Add basic support classes for cube planner algorithms
+* [KYLIN-2961] - Provide user guide for Ranger Kylin Plugin
+
 ## v2.1.0 - 2017-08-17
 
-_Tag:_ [kylin-2.1.0](https://github.com/apache/kylin/tree/kylin-2.0.0)
-This is a major release after 2.0, with more than 100 bug fixes and enhancements. (/docs21/howto/howto_upgrade.html).
+_Tag:_ [kylin-2.1.0](https://github.com/apache/kylin/tree/kylin-2.1.0)
+This is a major release after 2.0, with more than 100 bug fixes and enhancements. Check [How to upgrade](/docs21/howto/howto_upgrade.html).
 
 __New Feature__
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/b0597970/website/_docs21/tutorial/acl.cn.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/acl.cn.md b/website/_docs21/tutorial/acl.cn.md
index 61de162..53cf83c 100644
--- a/website/_docs21/tutorial/acl.cn.md
+++ b/website/_docs21/tutorial/acl.cn.md
@@ -7,7 +7,7 @@ version: v1.2
 since: v0.7.1
 ---
 
-  
+> 从v2.2.0版本开始,Cube ACL功能已经移除, 请使用[Project level ACL](/docs21/tutorial/project_level_acl.html)进行权限管理。
 
 在`Cubes`页面,双击cube行查看详细信息。在这里我们关注`Access`标签。
 点击`+Grant`按钮进行授权。

http://git-wip-us.apache.org/repos/asf/kylin/blob/b0597970/website/_docs21/tutorial/acl.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/acl.md b/website/_docs21/tutorial/acl.md
index b05d7ac..6b7d3c6 100644
--- a/website/_docs21/tutorial/acl.md
+++ b/website/_docs21/tutorial/acl.md
@@ -8,7 +8,7 @@ since: v0.7.1
 
 ```
 Notes:
-Cube ACL is removed since v2.2.0, please use ![Project level ACL](/docs21/tutorial/project_level_acl.html) to manager ACL.
+Cube ACL is removed since v2.2.0, please use [Project level ACL](/docs21/tutorial/project_level_acl.html) to manager ACL.
 ```
 
 In `Cubes` page, double click the cube row to see the detail information. Here we focus on the `Access` tab.

http://git-wip-us.apache.org/repos/asf/kylin/blob/b0597970/website/download/index.cn.md
----------------------------------------------------------------------
diff --git a/website/download/index.cn.md b/website/download/index.cn.md
index 04451d5..e2ee352 100644
--- a/website/download/index.cn.md
+++ b/website/download/index.cn.md
@@ -5,30 +5,27 @@ title: 下载
 
 您可以按照这些[步骤](https://www.apache.org/info/verification.html) 并使用这些[KEYS](http://kylin.apache.org/KEYS)来验证下载文件的有效性.
 
-## 2.1.0
+## 2.2.0
 
 - [Release notes](/docs21/release_notes.html) 和 [升级指南](/docs20/howto/howto_upgrade.html) 
-- 源代码下载: [apache-kylin-2.1.0-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-src.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-src.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-src.tar.gz.md5)\]
+- 源代码下载: [apache-kylin-2.2.0-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-src.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-src.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-src.tar.gz.md5)\]
 - 二进制包下载:
-  - for HBase 1.x (includes HDP 2.3+, AWS EMR 5.0 - 5.7, Azure HDInsight 3.4 - 3.6) - [apache-kylin-2.1.0-bin-hbase1x.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-bin-hbase1x.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-bin-hbase1x.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-bin-hbase1x.tar.gz.md5)\]
-  - for CDH 5.7-5.10 - [apache-kylin-2.1.0-bin-cdh57.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-bin-cdh57.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-bin-cdh57.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-bin-cdh57.tar.gz.md5)\]
+  - for HBase 1.x (includes HDP 2.3+, AWS EMR 5.0 - 5.7, Azure HDInsight 3.4 - 3.6) - [apache-kylin-2.2.0-bin-hbase1x.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-hbase1x.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-hbase1x.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-hbase1x.tar.gz.md5)\]
+  - for CDH 5.7-5.10 - [apache-kylin-2.2.0-bin-cdh57.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-cdh57.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-cdh57.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-cdh57.tar.gz.md5)\]
 
-## 2.0.0
+## 2.2.0
 
-- 这是最新的 Apache Kylin,功能包括 **Spark 构建引擎**,支持**雪花模型**,并能运行 **TPC-H 基准测试**。[查看更多信息](/cn/blog/2017/02/25/v2.0.0-beta-ready/)。
-- [Release notes](/docs20/release_notes.html) 和 [升级指南](/docs20/howto/howto_upgrade.html) (*<u>注意Kylin 2.0中的配置属性都已改名</u>*)
-- 源代码下载: [apache-kylin-2.0.0-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-src.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-src.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-src.tar.gz.md5)\]
+- [Release notes](/docs21/release_notes.html) 和 [升级指南](/docs20/howto/howto_upgrade.html) 
+- 源代码下载: [apache-kylin-2.2.0-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-src.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-src.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-src.tar.gz.md5)\]
 - 二进制包下载:
-  - for HBase 0.98 (includes HDP 2.2, CDH 5.2/5.3) - [apache-kylin-2.0.0-bin-hbase098.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase098.tar.gz)  \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase098.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase098.tar.gz.md5)\]
-  - for HBase 1.x (includes HDP 2.3+, AWS EMR 5.0 - 5.7, Azure HDInsight 3.4 - 3.6) - [apache-kylin-2.0.0-bin-hbase1x.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase1x.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase1x.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase1x.tar.gz.md5)\]
-  - for CDH 5.7 - 5.10 - [apache-kylin-2.0.0-bin-cdh57.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-cdh57.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-cdh57.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-cdh57.tar.gz.md5)\]
-
+  - for HBase 1.x (includes HDP 2.3+, AWS EMR 5.0 - 5.7, Azure HDInsight 3.4 - 3.6) - [apache-kylin-2.2.0-bin-hbase1x.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-hbase1x.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-hbase1x.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-hbase1x.tar.gz.md5)\]
+  - for CDH 5.7-5.10 - [apache-kylin-2.2.0-bin-cdh57.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-cdh57.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-cdh57.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-cdh57.tar.gz.md5)\]
 
 ## 以前的版本  
 Apache Kylin的旧版本可以从 [https://archive.apache.org/dist/kylin/](https://archive.apache.org/dist/kylin/) 下载。
 
 ## ODBC 驱动程序
-* [Kylin ODBC 驱动 v2.1.0](http://kylin.apache.org/download/KylinODBCDriver-2.1.0.zip)  (与所有 Kylin 版本兼容)
+* [Kylin ODBC 驱动 v2.2.0](http://kylin.apache.org/download/KylinODBCDriver-2.2.0.zip)  (与所有 Kylin 版本兼容)
 * [Kylin ODBC 驱动 v1.6](http://kylin.apache.org/download/KylinODBCDriver-1.6.zip)  (与所有 Kylin 版本兼容)
 * [Kylin ODBC 驱动 v1.5](http://kylin.apache.org/download/KylinODBCDriver-1.5.zip) 
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/b0597970/website/download/index.md
----------------------------------------------------------------------
diff --git a/website/download/index.md b/website/download/index.md
index b8a855b..1b6d24f 100644
--- a/website/download/index.md
+++ b/website/download/index.md
@@ -6,6 +6,14 @@ permalink: /download/index.html
 
 You can verify the download by following these [procedures](https://www.apache.org/info/verification.html) and using these [KEYS](http://kylin.apache.org/KEYS).
 
+## 2.2.0
+- This is a major release after 2.1, with more than 70 bug fixes and enhancements. For the detail list please check release notes. 
+- [Release notes](/docs21/release_notes.html) and [upgrade guide](/docs21/howto/howto_upgrade.html) 
+- Source download: [apache-kylin-2.2.0-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-src.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-src.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-src.tar.gz.md5)\]
+- Binary download:
+  - for HBase 1.x (includes HDP 2.3+, AWS EMR 5.0 - 5.7, Azure HDInsight 3.4 - 3.6) - [apache-kylin-2.2.0-bin-hbase1x.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-hbase1x.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-hbase1x.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-hbase1x.tar.gz.md5)\]
+  - for CDH 5.7-5.10 - [apache-kylin-2.2.0-bin-cdh57.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-cdh57.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-cdh57.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.2.0/apache-kylin-2.2.0-bin-cdh57.tar.gz.md5)\]
+
 ## 2.1.0
 - This is a major release after 2.0, with more than 100 bug fixes and enhancements. For the detail list please check release notes. 
 - [Release notes](/docs21/release_notes.html) and [upgrade guide](/docs21/howto/howto_upgrade.html) 
@@ -15,19 +23,6 @@ You can verify the download by following these [procedures](https://www.apache.o
   - for CDH 5.7-5.10 - [apache-kylin-2.1.0-bin-cdh57.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-bin-cdh57.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-bin-cdh57.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.1.0/apache-kylin-2.1.0-bin-cdh57.tar.gz.md5)\]
 
 
-
-## 2.0.0
-
-- This is the most powerful build ever that features **Spark Cubing**, **Snowflake Data Model** and runs **TPC-H Benchmark**. [Read more here](/blog/2017/02/25/v2.0.0-beta-ready/).
-- [Release notes](/docs20/release_notes.html) and [upgrade guide](/docs20/howto/howto_upgrade.html) (*<u>note the property names in Kylin 2.0 have changed</u>*)
-- Source download: [apache-kylin-2.0.0-src.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-src.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-src.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-src.tar.gz.md5)\]
-- Binary download:
-  - for HBase 0.98 (includes HDP 2.2, CDH 5.2/5.3) - [apache-kylin-2.0.0-bin-hbase098.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase098.tar.gz)  \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase098.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase098.tar.gz.md5)\]
-  - for HBase 1.x (includes HDP 2.3-2.5, AWS EMR 5.0 - 5.7, Azure HDInsight 3.4 - 3.6) - [apache-kylin-2.0.0-bin-hbase1x.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase1x.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase1x.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-hbase1x.tar.gz.md5)\]
-  - for CDH 5.7-5.10 - [apache-kylin-2.0.0-bin-cdh57.tar.gz](http://www.apache.org/dyn/closer.cgi/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-cdh57.tar.gz) \[[asc](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-cdh57.tar.gz.asc)\] \[[md5](https://dist.apache.org/repos/dist/release/kylin/apache-kylin-2.0.0/apache-kylin-2.0.0-bin-cdh57.tar.gz.md5)\]
-
-
-
 ## Previous Release
 
 Older releases can be found in [https://archive.apache.org/dist/kylin/](https://archive.apache.org/dist/kylin/).