You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2017/08/31 10:57:58 UTC

[1/4] kylin git commit: add tutorial for MicroStrategy

Repository: kylin
Updated Branches:
  refs/heads/document 08ab05ec4 -> c1af8222f


add tutorial for MicroStrategy

Signed-off-by: shaofengshi <sh...@apache.org>


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

Branch: refs/heads/document
Commit: 6555f6d2628f190cfd3442732875b83120e88312
Parents: 08ab05e
Author: joannahe <he...@gmail.com>
Authored: Thu Aug 31 16:30:58 2017 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Aug 31 16:35:00 2017 +0800

----------------------------------------------------------------------
 website/_docs21/tutorial/microstrategy.md       |  80 +++++++++++++++++++
 website/images/tutorial/2.1/MicroStrategy/1.png | Bin 0 -> 207356 bytes
 .../images/tutorial/2.1/MicroStrategy/10.png    | Bin 0 -> 185351 bytes
 website/images/tutorial/2.1/MicroStrategy/2.png | Bin 0 -> 154312 bytes
 website/images/tutorial/2.1/MicroStrategy/3.png | Bin 0 -> 345509 bytes
 website/images/tutorial/2.1/MicroStrategy/4.png | Bin 0 -> 187026 bytes
 website/images/tutorial/2.1/MicroStrategy/5.png | Bin 0 -> 158694 bytes
 website/images/tutorial/2.1/MicroStrategy/6.png | Bin 0 -> 143233 bytes
 website/images/tutorial/2.1/MicroStrategy/7.png | Bin 0 -> 125824 bytes
 website/images/tutorial/2.1/MicroStrategy/8.png | Bin 0 -> 283974 bytes
 website/images/tutorial/2.1/MicroStrategy/9.png | Bin 0 -> 357212 bytes
 11 files changed, 80 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/6555f6d2/website/_docs21/tutorial/microstrategy.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/microstrategy.md b/website/_docs21/tutorial/microstrategy.md
new file mode 100644
index 0000000..8a7cc45
--- /dev/null
+++ b/website/_docs21/tutorial/microstrategy.md
@@ -0,0 +1,80 @@
+---
+layout: docs21
+title:  MicroStrategy 10
+categories: tutorial
+permalink: /docs21/tutorial/microstrategy.html
+---
+
+## Integration from MicroStrategy 10.X
+
+### Install ODBC Driver
+
+Refer to this guide: [Kylin ODBC Driver Tutorial](./odbc.html).
+Please make sure to download and install Kylin ODBC Driver __v1.6__ or above. If you already installed ODBC Driver in your system, please uninstall it first. already installed ODBC Driver in your system, please uninstall it first.  
+
+### Connect to Kylin Server
+
+Connect Kylin using ODBC driver: open your MicroStrategy Developer and connect to the project source where your are going to connect Kylin data source using a user account with administrative privilege. 
+
+Once logged in, go to `Administration` -> `Configuration manager` -> `Database Instance`, create a new database instance with local ODBC connection that you created in the previous step. Under database connection type, please choose Generic DBMS.
+
+![](/images/tutorial/2.1/MicroStrategy/1.png)
+
+### Setting Database instance
+
+Depending on your business scenario, you may need to create a new project and set kylin database instance as your primary database instance or if there is an existing project, set kylin database instance as one of your primary or non-primary database instance. You can achieve this by right click on your project, and go to `project configuration` -> `database instance`. 
+
+![](/images/tutorial/2.1/MicroStrategy/1.png)
+
+### Import logical table
+
+Open up your project, go to `schema` -> `warehouse catalog` to import the tables your need. 
+
+![](/images/tutorial/2.1/MicroStrategy/4.png)
+
+### Building Schema and Public Objects
+
+Create Attribute, Facts and Metric objects
+
+![](/images/tutorial/2.1/MicroStrategy/5.png)
+
+![](/images/tutorial/2.1/MicroStrategy/6.png)
+
+![](/images/tutorial/2.1/MicroStrategy/7.png)
+
+![](/images/tutorial/2.1/MicroStrategy/8.png)
+
+### Create a Simple Report
+
+Now you can start creating reports with Kylin as Data source.
+
+![](/images/tutorial/2.1/MicroStrategy/9.png)
+
+![](/images/tutorial/2.1/MicroStrategy/10.png)
+
+### Best Practice for connecting MicroStrategy to Kylin datasource
+
+1. Kylin does not work with multiple SQL passes at the moment, so it is recommended to set up your report intermediate table type as derived, you can change this setting at report level using `Data`-> `VLDB property`-> `Tables`-> `Intermediate Table Type`
+
+2. Avoid using below functionality in MicroStrategy as it will generate multiple sql passes that can not be bypassed by VLDB property:
+
+   ​	Creation of datamarts
+
+   ​	Query partitioned tables
+
+   ​	Reports with custom groups
+
+3. Dimension named with kylin keywords will cause sql to error out. You may find kylin keywords here, it is recommended to avoid naming the column name as kylin keywords, especially when you use MicroStrategy as the front-end BI tool, as far as I am concern there is no setting MicroStrategy that can escape the keyword.  [https://calcite.apache.org/docs/reference.html#keywords](https://calcite.apache.org/docs/reference.html#keywords)
+
+4. If underlying Kylin data model has left join from fact table to lookup table, In order for Microstrategy to also generate the same left join in sql, please follow below MicroStrategy TN to modify VLDB property:
+
+   [https://community.microstrategy.com/s/article/ka1440000009GrQAAU/KB17514-Using-the-Preserve-all-final-pass-result-elements-VLDB](https://community.microstrategy.com/s/article/ka1440000009GrQAAU/KB17514-Using-the-Preserve-all-final-pass-result-elements-VLDB)
+
+5. By default, MicroStrategy generate SQL query with date filter in a format like 'mm/dd/yyyy'. This format might be different from Kylin's date format, if so, query will error out. You may follow below steps to change MicroStrategy to generate the same date format SQL as Kylin,  
+
+   1. go to `Instance` -> `Administration` -> `Configuration Manager` -> `Database Instance`. 
+   2. Then right click on the database, choose VLDB properties. 
+   3. On the top menu choose `Tools` -> `show Advanced Settings`.
+   4. Go to `select/insert` -> `date format`.
+   5. Change the date format to follow date format in kylin, for example 'yyyy-mm-dd'.
+   6.  Restart MicroStrategy Intelligence Server so that change can be effective. 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/kylin/blob/6555f6d2/website/images/tutorial/2.1/MicroStrategy/1.png
----------------------------------------------------------------------
diff --git a/website/images/tutorial/2.1/MicroStrategy/1.png b/website/images/tutorial/2.1/MicroStrategy/1.png
new file mode 100644
index 0000000..cc22454
Binary files /dev/null and b/website/images/tutorial/2.1/MicroStrategy/1.png differ

http://git-wip-us.apache.org/repos/asf/kylin/blob/6555f6d2/website/images/tutorial/2.1/MicroStrategy/10.png
----------------------------------------------------------------------
diff --git a/website/images/tutorial/2.1/MicroStrategy/10.png b/website/images/tutorial/2.1/MicroStrategy/10.png
new file mode 100644
index 0000000..59d215e
Binary files /dev/null and b/website/images/tutorial/2.1/MicroStrategy/10.png differ

http://git-wip-us.apache.org/repos/asf/kylin/blob/6555f6d2/website/images/tutorial/2.1/MicroStrategy/2.png
----------------------------------------------------------------------
diff --git a/website/images/tutorial/2.1/MicroStrategy/2.png b/website/images/tutorial/2.1/MicroStrategy/2.png
new file mode 100644
index 0000000..9d75e70
Binary files /dev/null and b/website/images/tutorial/2.1/MicroStrategy/2.png differ

http://git-wip-us.apache.org/repos/asf/kylin/blob/6555f6d2/website/images/tutorial/2.1/MicroStrategy/3.png
----------------------------------------------------------------------
diff --git a/website/images/tutorial/2.1/MicroStrategy/3.png b/website/images/tutorial/2.1/MicroStrategy/3.png
new file mode 100644
index 0000000..4222c4e
Binary files /dev/null and b/website/images/tutorial/2.1/MicroStrategy/3.png differ

http://git-wip-us.apache.org/repos/asf/kylin/blob/6555f6d2/website/images/tutorial/2.1/MicroStrategy/4.png
----------------------------------------------------------------------
diff --git a/website/images/tutorial/2.1/MicroStrategy/4.png b/website/images/tutorial/2.1/MicroStrategy/4.png
new file mode 100644
index 0000000..fb2fadd
Binary files /dev/null and b/website/images/tutorial/2.1/MicroStrategy/4.png differ

http://git-wip-us.apache.org/repos/asf/kylin/blob/6555f6d2/website/images/tutorial/2.1/MicroStrategy/5.png
----------------------------------------------------------------------
diff --git a/website/images/tutorial/2.1/MicroStrategy/5.png b/website/images/tutorial/2.1/MicroStrategy/5.png
new file mode 100644
index 0000000..58a92db
Binary files /dev/null and b/website/images/tutorial/2.1/MicroStrategy/5.png differ

http://git-wip-us.apache.org/repos/asf/kylin/blob/6555f6d2/website/images/tutorial/2.1/MicroStrategy/6.png
----------------------------------------------------------------------
diff --git a/website/images/tutorial/2.1/MicroStrategy/6.png b/website/images/tutorial/2.1/MicroStrategy/6.png
new file mode 100644
index 0000000..992207a
Binary files /dev/null and b/website/images/tutorial/2.1/MicroStrategy/6.png differ

http://git-wip-us.apache.org/repos/asf/kylin/blob/6555f6d2/website/images/tutorial/2.1/MicroStrategy/7.png
----------------------------------------------------------------------
diff --git a/website/images/tutorial/2.1/MicroStrategy/7.png b/website/images/tutorial/2.1/MicroStrategy/7.png
new file mode 100644
index 0000000..d240ed5
Binary files /dev/null and b/website/images/tutorial/2.1/MicroStrategy/7.png differ

http://git-wip-us.apache.org/repos/asf/kylin/blob/6555f6d2/website/images/tutorial/2.1/MicroStrategy/8.png
----------------------------------------------------------------------
diff --git a/website/images/tutorial/2.1/MicroStrategy/8.png b/website/images/tutorial/2.1/MicroStrategy/8.png
new file mode 100644
index 0000000..f45d316
Binary files /dev/null and b/website/images/tutorial/2.1/MicroStrategy/8.png differ

http://git-wip-us.apache.org/repos/asf/kylin/blob/6555f6d2/website/images/tutorial/2.1/MicroStrategy/9.png
----------------------------------------------------------------------
diff --git a/website/images/tutorial/2.1/MicroStrategy/9.png b/website/images/tutorial/2.1/MicroStrategy/9.png
new file mode 100644
index 0000000..aacee60
Binary files /dev/null and b/website/images/tutorial/2.1/MicroStrategy/9.png differ


[4/4] kylin git commit: Update doc layout

Posted by sh...@apache.org.
Update doc layout


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

Branch: refs/heads/document
Commit: c1af8222f1b7d8196a2065e1cf3adfc638730cb8
Parents: 2291fce
Author: shaofengshi <sh...@apache.org>
Authored: Thu Aug 31 18:57:47 2017 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Aug 31 18:57:47 2017 +0800

----------------------------------------------------------------------
 website/_data/docs21.yml                        | 22 ++++++----
 .../howto/howto_build_cube_with_restapi.md      |  2 +-
 website/_docs21/howto/howto_cleanup_storage.md  |  2 +-
 website/_docs21/howto/howto_jdbc.md             |  2 +-
 website/_docs21/howto/howto_ldap_and_sso.md     |  2 +-
 .../_docs21/howto/howto_update_coprocessor.md   |  2 +-
 website/_docs21/howto/howto_use_beeline.md      |  2 +-
 website/_docs21/howto/howto_use_restapi.md      | 44 ++++++++++++++++++++
 website/_docs21/index.md                        | 16 +++----
 website/_docs21/tutorial/acl.md                 |  2 +-
 website/_docs21/tutorial/create_cube.md         |  2 +-
 website/_docs21/tutorial/cube_build_job.md      |  2 +-
 .../_docs21/tutorial/cube_build_performance.md  |  2 +-
 website/_docs21/tutorial/flink.md               |  2 +-
 website/_docs21/tutorial/hue.md                 |  2 +-
 website/_docs21/tutorial/microstrategy.md       |  2 +-
 website/_docs21/tutorial/squirrel.md            |  2 +-
 website/_docs21/tutorial/web.md                 |  2 +-
 18 files changed, 80 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_data/docs21.yml
----------------------------------------------------------------------
diff --git a/website/_data/docs21.yml b/website/_data/docs21.yml
index 3f3380f..90acd70 100644
--- a/website/_data/docs21.yml
+++ b/website/_data/docs21.yml
@@ -19,11 +19,11 @@
   docs:
   - index
   - release_notes
+  - gettingstarted/concepts
+  - gettingstarted/terminology
   - gettingstarted/faq
   - gettingstarted/events
   - gettingstarted/best_practices
-  - gettingstarted/terminology
-  - gettingstarted/concepts
 
 - title: Installation
   docs:
@@ -37,25 +37,29 @@
 - title: Tutorial
   docs:
   - tutorial/kylin_sample
+  - tutorial/web
   - tutorial/create_cube
   - tutorial/cube_build_job
-  - tutorial/cube_spark
   - tutorial/acl
-  - tutorial/web
+  - tutorial/cube_spark
+  - tutorial/cube_build_performance
+
+- title: Integration
+  docs:
+  - tutorial/odbc
+  - howto/howto_jdbc
   - tutorial/tableau
   - tutorial/tableau_91
   - tutorial/powerbi
-  - tutorial/odbc
-  - tutorial/flink
+  - tutorial/microstrategy
   - tutorial/squirrel
-  - tutorial/cube_build_performance
+  - tutorial/flink
   - tutorial/hue
 
 - title: How To
   docs:
-  - howto/howto_build_cube_with_restapi
-  - howto/howto_use_restapi_in_js
   - howto/howto_use_restapi
+  - howto/howto_build_cube_with_restapi
   - howto/howto_optimize_cubes
   - howto/howto_optimize_build
   - howto/howto_backup_metadata

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/howto/howto_build_cube_with_restapi.md
----------------------------------------------------------------------
diff --git a/website/_docs21/howto/howto_build_cube_with_restapi.md b/website/_docs21/howto/howto_build_cube_with_restapi.md
index 9092afe..8808b7b 100644
--- a/website/_docs21/howto/howto_build_cube_with_restapi.md
+++ b/website/_docs21/howto/howto_build_cube_with_restapi.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  Build Cube with RESTful API
+title:  Build Cube with API
 categories: howto
 permalink: /docs21/howto/howto_build_cube_with_restapi.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/howto/howto_cleanup_storage.md
----------------------------------------------------------------------
diff --git a/website/_docs21/howto/howto_cleanup_storage.md b/website/_docs21/howto/howto_cleanup_storage.md
index 323e138..f488040 100644
--- a/website/_docs21/howto/howto_cleanup_storage.md
+++ b/website/_docs21/howto/howto_cleanup_storage.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  Cleanup Storage (HDFS & HBase)
+title:  Cleanup Storage
 categories: howto
 permalink: /docs21/howto/howto_cleanup_storage.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/howto/howto_jdbc.md
----------------------------------------------------------------------
diff --git a/website/_docs21/howto/howto_jdbc.md b/website/_docs21/howto/howto_jdbc.md
index f2fd6f0..4885a84 100644
--- a/website/_docs21/howto/howto_jdbc.md
+++ b/website/_docs21/howto/howto_jdbc.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  Use JDBC Driver
+title:  Kylin JDBC Driver
 categories: howto
 permalink: /docs21/howto/howto_jdbc.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/howto/howto_ldap_and_sso.md
----------------------------------------------------------------------
diff --git a/website/_docs21/howto/howto_ldap_and_sso.md b/website/_docs21/howto/howto_ldap_and_sso.md
index 5e7ca29..8d6bd47 100644
--- a/website/_docs21/howto/howto_ldap_and_sso.md
+++ b/website/_docs21/howto/howto_ldap_and_sso.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title: Enable Security with LDAP and SSO
+title: Secure with LDAP and SSO
 categories: howto
 permalink: /docs21/howto/howto_ldap_and_sso.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/howto/howto_update_coprocessor.md
----------------------------------------------------------------------
diff --git a/website/_docs21/howto/howto_update_coprocessor.md b/website/_docs21/howto/howto_update_coprocessor.md
index 87805eb..99f5d0c 100644
--- a/website/_docs21/howto/howto_update_coprocessor.md
+++ b/website/_docs21/howto/howto_update_coprocessor.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  How to Update HBase Coprocessor
+title:  Update Coprocessor
 categories: howto
 permalink: /docs21/howto/howto_update_coprocessor.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/howto/howto_use_beeline.md
----------------------------------------------------------------------
diff --git a/website/_docs21/howto/howto_use_beeline.md b/website/_docs21/howto/howto_use_beeline.md
index 2c4b29c..c730cc1 100644
--- a/website/_docs21/howto/howto_use_beeline.md
+++ b/website/_docs21/howto/howto_use_beeline.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  Use Beeline for Hive Commands
+title:  Use Beeline for Hive
 categories: howto
 permalink: /docs21/howto/howto_use_beeline.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/howto/howto_use_restapi.md
----------------------------------------------------------------------
diff --git a/website/_docs21/howto/howto_use_restapi.md b/website/_docs21/howto/howto_use_restapi.md
index afdad37..f5b5cd1 100644
--- a/website/_docs21/howto/howto_use_restapi.md
+++ b/website/_docs21/howto/howto_use_restapi.md
@@ -1111,3 +1111,47 @@ This API is specific for stream cube's building;
 
 #### Path variable
 * cubeName - `required` `string` Cube name
+
+
+
+## Use RESTful API in Javascript
+
+Keypoints of call Kylin RESTful API in web page are:
+
+1. Add basic access authorization info in http headers.
+
+2. Use proper request type and data synax.
+
+Kylin security is based on basic access authorization, if you want to use API in your javascript, you need to add authorization info in http headers; for example:
+
+```
+$.ajaxSetup({
+      headers: { 'Authorization': "Basic eWFu**********X***ZA==", 'Content-Type': 'application/json;charset=utf-8' } // use your own authorization code here
+    });
+    var request = $.ajax({
+       url: "http://hostname/kylin/api/query",
+       type: "POST",
+       data: '{"sql":"select count(*) from SUMMARY;","offset":0,"limit":50000,"acceptPartial":true,"project":"test"}',
+       dataType: "json"
+    });
+    request.done(function( msg ) {
+       alert(msg);
+    }); 
+    request.fail(function( jqXHR, textStatus ) {
+       alert( "Request failed: " + textStatus );
+  });
+
+```
+
+To generate your authorization code, download and import "jquery.base64.js" from [https://github.com/yckart/jquery.base64.js](https://github.com/yckart/jquery.base64.js)).
+
+```
+var authorizationCode = $.base64('encode', 'NT_USERNAME' + ":" + 'NT_PASSWORD');
+
+$.ajaxSetup({
+   headers: { 
+    'Authorization': "Basic " + authorizationCode, 
+    'Content-Type': 'application/json;charset=utf-8' 
+   }
+});
+```
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/index.md
----------------------------------------------------------------------
diff --git a/website/_docs21/index.md b/website/_docs21/index.md
index 570c0a7..12bf1b1 100644
--- a/website/_docs21/index.md
+++ b/website/_docs21/index.md
@@ -28,13 +28,13 @@ Installation & Setup
 Tutorial
 ------------  
 1. [Quick Start with Sample Cube](tutorial/kylin_sample.html)
-2. [Cube Creation](tutorial/create_cube.html)
+2. [Web Interface](tutorial/web.html)
+3. [Cube Wizard](tutorial/create_cube.html)
 3. [Cube Build and Job Monitoring](tutorial/cube_build_job.html)
-4. [Web Interface](tutorial/web.html)
 5. [SQL reference: by Apache Calcite](http://calcite.apache.org/docs/reference.html)
 6. [Build Cube with Streaming Data](tutorial/cube_streaming.html)
 7. [Build Cube with Spark Engine (beta)](tutorial/cube_spark.html)
-8. [Cube Build Tuning Step by Step](tutorial/cube_build_performance.html)
+8. [Cube Build Tuning](tutorial/cube_build_performance.html)
 9. [Enable Query Pushdown](tutorial/query_pushdown.html)
 
 
@@ -45,10 +45,10 @@ Connectivity and APIs
 2. [JDBC driver](howto/howto_jdbc.html)
 3. [RESTful API list](howto/howto_use_restapi.html)
 4. [Build cube with RESTful API](howto/howto_build_cube_with_restapi.html)
-5. [Call RESTful API in Javascript](howto/howto_use_restapi_in_js.html)
-6. [Connect from MS Excel and PowerBI](tutorial/powerbi.html)
-7. [Connect from Tableau 8](tutorial/tableau.html)
-8. [Connect from Tableau 9](tutorial/tableau_91.html)
+5. [Connect from MS Excel and PowerBI](tutorial/powerbi.html)
+6. [Connect from Tableau 8](tutorial/tableau.html)
+7. [Connect from Tableau 9](tutorial/tableau_91.html)
+8. [Connect from MicroStrategy](tutorial/microstrategy.html)
 9. [Connect from SQuirreL](tutorial/squirrel.html)
 10. [Connect from Apache Flink](tutorial/flink.html)
 11. [Connect from Apache Hue](tutorial/hue.html)
@@ -56,7 +56,7 @@ Connectivity and APIs
 Operations
 ------------  
 1. [Backup/restore Kylin metadata](howto/howto_backup_metadata.html)
-2. [Cleanup storage (HDFS & HBase)](howto/howto_cleanup_storage.html)
+2. [Cleanup storage](howto/howto_cleanup_storage.html)
 3. [Upgrade from old version](howto/howto_upgrade.html)
 
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/tutorial/acl.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/acl.md b/website/_docs21/tutorial/acl.md
index b3b7fdf..0485e94 100644
--- a/website/_docs21/tutorial/acl.md
+++ b/website/_docs21/tutorial/acl.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  Kylin Cube Permission
+title: Cube Permission
 categories: tutorial
 permalink: /docs21/tutorial/acl.html
 since: v0.7.1

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/tutorial/create_cube.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/create_cube.md b/website/_docs21/tutorial/create_cube.md
index c86984f..52fa6fd 100644
--- a/website/_docs21/tutorial/create_cube.md
+++ b/website/_docs21/tutorial/create_cube.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  Kylin Cube Creation
+title:  Cube Wizard
 categories: tutorial
 permalink: /docs21/tutorial/create_cube.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/tutorial/cube_build_job.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/cube_build_job.md b/website/_docs21/tutorial/cube_build_job.md
index c042f73..63a5210 100644
--- a/website/_docs21/tutorial/cube_build_job.md
+++ b/website/_docs21/tutorial/cube_build_job.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  Kylin Cube Build and Job Monitoring
+title:  Cube Build and Job Monitoring
 categories: tutorial
 permalink: /docs21/tutorial/cube_build_job.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/tutorial/cube_build_performance.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/cube_build_performance.md b/website/_docs21/tutorial/cube_build_performance.md
index 7169488..8be4bda 100755
--- a/website/_docs21/tutorial/cube_build_performance.md
+++ b/website/_docs21/tutorial/cube_build_performance.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title: Cube Build Tuning Step by Step
+title: Cube Build Tuning
 categories: tutorial
 permalink: /docs21/tutorial/cube_build_performance.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/tutorial/flink.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/flink.md b/website/_docs21/tutorial/flink.md
index 3390fd7..fdd0d87 100644
--- a/website/_docs21/tutorial/flink.md
+++ b/website/_docs21/tutorial/flink.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  Connect from Apache Flink
+title:  Apache Flink
 categories: tutorial
 permalink: /docs21/tutorial/flink.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/tutorial/hue.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/hue.md b/website/_docs21/tutorial/hue.md
index fa00d82..84dea6d 100755
--- a/website/_docs21/tutorial/hue.md
+++ b/website/_docs21/tutorial/hue.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title: Connect from Apache Hue
+title: Apache Hue
 categories: tutorial
 permalink: /docs21/tutorial/hue.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/tutorial/microstrategy.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/microstrategy.md b/website/_docs21/tutorial/microstrategy.md
index 67ec4c3..c20604d 100644
--- a/website/_docs21/tutorial/microstrategy.md
+++ b/website/_docs21/tutorial/microstrategy.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  Integration with MicroStrategy 10.X
+title:  MicroStrategy
 categories: tutorial
 permalink: /docs21/tutorial/microstrategy.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/tutorial/squirrel.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/squirrel.md b/website/_docs21/tutorial/squirrel.md
index 6b410d1..d3ba148 100644
--- a/website/_docs21/tutorial/squirrel.md
+++ b/website/_docs21/tutorial/squirrel.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  Connect from SQuirreL
+title:  SQuirreL
 categories: tutorial
 permalink: /docs21/tutorial/squirrel.html
 ---

http://git-wip-us.apache.org/repos/asf/kylin/blob/c1af8222/website/_docs21/tutorial/web.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/web.md b/website/_docs21/tutorial/web.md
index 44758b2..a0d7fd1 100644
--- a/website/_docs21/tutorial/web.md
+++ b/website/_docs21/tutorial/web.md
@@ -1,6 +1,6 @@
 ---
 layout: docs21
-title:  Kylin Web Interface
+title:  Web Interface
 categories: tutorial
 permalink: /docs21/tutorial/web.html
 ---


[3/4] kylin git commit: minor changes to MicroStrategy tutorial

Posted by sh...@apache.org.
minor changes to MicroStrategy tutorial

Signed-off-by: shaofengshi <sh...@apache.org>


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

Branch: refs/heads/document
Commit: 2291fcee5b6f0b66c4782372b8ded976352125da
Parents: c8126da
Author: joannahe <he...@gmail.com>
Authored: Thu Aug 31 17:26:39 2017 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Aug 31 17:29:12 2017 +0800

----------------------------------------------------------------------
 website/_docs21/tutorial/microstrategy.md       |  22 +++++++++++--------
 website/images/tutorial/2.1/MicroStrategy/0.png | Bin 0 -> 207801 bytes
 2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/2291fcee/website/_docs21/tutorial/microstrategy.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/microstrategy.md b/website/_docs21/tutorial/microstrategy.md
index 7c549eb..67ec4c3 100644
--- a/website/_docs21/tutorial/microstrategy.md
+++ b/website/_docs21/tutorial/microstrategy.md
@@ -1,31 +1,35 @@
 ---
 layout: docs21
-title:  MicroStrategy 10
+title:  Integration with MicroStrategy 10.X
 categories: tutorial
 permalink: /docs21/tutorial/microstrategy.html
 ---
 
-## Integration with MicroStrategy 10.X
-
 ### Install ODBC Driver
 
 Refer to this guide: [Kylin ODBC Driver Tutorial](./odbc.html).
-Please make sure to download and install Kylin ODBC Driver __v1.6__ or above. If you already installed ODBC Driver in your system, please uninstall it first. already installed ODBC Driver in your system, please uninstall it first.  
+Please make sure to download and install Kylin ODBC Driver __v1.6__ 64 bit or above. If you already installed ODBC Driver in your system, please uninstall it first. already installed ODBC Driver in your system, please uninstall it first.  
 
-### Connect to Kylin Server
+The Kylin ODBC driver needs to be installed in the machine or virtual environment where your Microstrategy Intelligenec Server is installed. 
 
-Connect Kylin using ODBC driver: open your MicroStrategy Developer and connect to the project source where your are going to connect Kylin data source using a user account with administrative privilege. 
+###Create Local DSN
 
-Once logged in, go to `Administration` -> `Configuration manager` -> `Database Instance`, create a new database instance with local ODBC connection that you created in the previous step. Under database connection type, please choose Generic DBMS.
+Open your window ODBC Data Source Administrator (64bit) and create a system DSN that point to your kylin instance. 
+
+![](/images/tutorial/2.1/MicroStrategy/0.png)
 
 ### Setting Database Instance
 
-Depending on your business scenario, you may need to create a new project and set Kylin database instance as your primary database instance or if there is an existing project, set Kylin database instance as one of your primary or non-primary database instance. You can achieve this by right click on your project, and go to `project configuration` -> `database instance`. 
+Connect Kylin using ODBC driver: open your MicroStrategy Developer and connect to the project source where your are going to connect Kylin data source using a user account with administrative privilege. 
+
+Once logged in, go to `Administration` -> `Configuration manager` -> `Database Instance`, create a new database instance with system DSN that you created in the previous step. Under database connection type, please choose Generic DBMS.
 
 ![](/images/tutorial/2.1/MicroStrategy/2.png)
 
 ![](/images/tutorial/2.1/MicroStrategy/1.png)
 
+Depending on your business scenario, you may need to create a new project and set Kylin database instance as your primary database instance or if there is an existing project, set Kylin database instance as one of your primary or non-primary database instance. You can achieve this by right click on your project, and go to `project configuration` -> `database instance`. 
+
 ### Import Logical Table
 
 Open up your project, go to `schema` -> `warehouse catalog` to import the tables your need. 
@@ -77,4 +81,4 @@ Now you can start creating reports with Kylin as data source.
    3. On the top menu choose `Tools` -> `show Advanced Settings`.
    4. Go to `select/insert` -> `date format`.
    5. Change the date format to follow date format in Kylin, for example 'yyyy-mm-dd'.
-   6.  Restart MicroStrategy Intelligence Server so that change can be effective. 
\ No newline at end of file
+   6. Restart MicroStrategy Intelligence Server so that change can be effective. 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/kylin/blob/2291fcee/website/images/tutorial/2.1/MicroStrategy/0.png
----------------------------------------------------------------------
diff --git a/website/images/tutorial/2.1/MicroStrategy/0.png b/website/images/tutorial/2.1/MicroStrategy/0.png
new file mode 100644
index 0000000..b4a478a
Binary files /dev/null and b/website/images/tutorial/2.1/MicroStrategy/0.png differ


[2/4] kylin git commit: minor update

Posted by sh...@apache.org.
minor update

Signed-off-by: shaofengshi <sh...@apache.org>


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

Branch: refs/heads/document
Commit: c8126dac9e7a8868b9aa31fafb30a20b4b09286c
Parents: 6555f6d
Author: joannahe <he...@gmail.com>
Authored: Thu Aug 31 17:03:53 2017 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Aug 31 17:11:02 2017 +0800

----------------------------------------------------------------------
 website/_docs21/tutorial/microstrategy.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/c8126dac/website/_docs21/tutorial/microstrategy.md
----------------------------------------------------------------------
diff --git a/website/_docs21/tutorial/microstrategy.md b/website/_docs21/tutorial/microstrategy.md
index 8a7cc45..7c549eb 100644
--- a/website/_docs21/tutorial/microstrategy.md
+++ b/website/_docs21/tutorial/microstrategy.md
@@ -5,7 +5,7 @@ categories: tutorial
 permalink: /docs21/tutorial/microstrategy.html
 ---
 
-## Integration from MicroStrategy 10.X
+## Integration with MicroStrategy 10.X
 
 ### Install ODBC Driver
 
@@ -18,15 +18,15 @@ Connect Kylin using ODBC driver: open your MicroStrategy Developer and connect t
 
 Once logged in, go to `Administration` -> `Configuration manager` -> `Database Instance`, create a new database instance with local ODBC connection that you created in the previous step. Under database connection type, please choose Generic DBMS.
 
-![](/images/tutorial/2.1/MicroStrategy/1.png)
+### Setting Database Instance
 
-### Setting Database instance
+Depending on your business scenario, you may need to create a new project and set Kylin database instance as your primary database instance or if there is an existing project, set Kylin database instance as one of your primary or non-primary database instance. You can achieve this by right click on your project, and go to `project configuration` -> `database instance`. 
 
-Depending on your business scenario, you may need to create a new project and set kylin database instance as your primary database instance or if there is an existing project, set kylin database instance as one of your primary or non-primary database instance. You can achieve this by right click on your project, and go to `project configuration` -> `database instance`. 
+![](/images/tutorial/2.1/MicroStrategy/2.png)
 
 ![](/images/tutorial/2.1/MicroStrategy/1.png)
 
-### Import logical table
+### Import Logical Table
 
 Open up your project, go to `schema` -> `warehouse catalog` to import the tables your need. 
 
@@ -46,13 +46,13 @@ Create Attribute, Facts and Metric objects
 
 ### Create a Simple Report
 
-Now you can start creating reports with Kylin as Data source.
+Now you can start creating reports with Kylin as data source.
 
 ![](/images/tutorial/2.1/MicroStrategy/9.png)
 
 ![](/images/tutorial/2.1/MicroStrategy/10.png)
 
-### Best Practice for connecting MicroStrategy to Kylin datasource
+### Best Practice for Connecting MicroStrategy to Kylin Data Source
 
 1. Kylin does not work with multiple SQL passes at the moment, so it is recommended to set up your report intermediate table type as derived, you can change this setting at report level using `Data`-> `VLDB property`-> `Tables`-> `Intermediate Table Type`
 
@@ -64,7 +64,7 @@ Now you can start creating reports with Kylin as Data source.
 
    ​	Reports with custom groups
 
-3. Dimension named with kylin keywords will cause sql to error out. You may find kylin keywords here, it is recommended to avoid naming the column name as kylin keywords, especially when you use MicroStrategy as the front-end BI tool, as far as I am concern there is no setting MicroStrategy that can escape the keyword.  [https://calcite.apache.org/docs/reference.html#keywords](https://calcite.apache.org/docs/reference.html#keywords)
+3. Dimension named with Kylin keywords will cause sql to error out. You may find Kylin keywords here, it is recommended to avoid naming the column name as Kylin keywords, especially when you use MicroStrategy as the front-end BI tool, as far as we know there is no setting in MicroStrategy that can escape the keyword.  [https://calcite.apache.org/docs/reference.html#keywords](https://calcite.apache.org/docs/reference.html#keywords)
 
 4. If underlying Kylin data model has left join from fact table to lookup table, In order for Microstrategy to also generate the same left join in sql, please follow below MicroStrategy TN to modify VLDB property:
 
@@ -76,5 +76,5 @@ Now you can start creating reports with Kylin as Data source.
    2. Then right click on the database, choose VLDB properties. 
    3. On the top menu choose `Tools` -> `show Advanced Settings`.
    4. Go to `select/insert` -> `date format`.
-   5. Change the date format to follow date format in kylin, for example 'yyyy-mm-dd'.
+   5. Change the date format to follow date format in Kylin, for example 'yyyy-mm-dd'.
    6.  Restart MicroStrategy Intelligence Server so that change can be effective. 
\ No newline at end of file