Merge pull request #119 from wso2/6.4.x

Merge 6.4.x branch into master

helm/integrator-broker-with-analytics/README.md

@@ -36,7 +36,7 @@ git clone https://github.com/wso2/kubernetes-ei.git
 ##### 2. Setup a Network File System (NFS) to be used for persistent storage.
 
 Create and export unique directories within the NFS server instance for each of the following Kubernetes Persistent Volume
-resources defined in the `<HELM_HOME>/integrator-broker-with-analytics-conf/values.yaml` file:
+resources defined in the `<HELM_HOME>/integrator-broker-with-analytics/values.yaml` file:
 
 * `sharedDeploymentLocationPath`
 * `sharedTenantsLocationPath`
@@ -59,10 +59,10 @@ Grant read-write-execute permissions to the `wso2carbon` user, for each of the p
 
 ##### 3. Provide configurations.
 
-a. The default product configurations are available at `<HELM_HOME>/integrator-broker-with-analytics-conf/confs` folder. Change the 
+a. The default product configurations are available at `<HELM_HOME>/integrator-broker-with-analytics/confs` folder. Change the
 configurations as necessary.
 
-b. Open the `<HELM_HOME>/integrator-broker-with-analytics-conf/values.yaml` and provide the following values.
+b. Open the `<HELM_HOME>/integrator-broker-with-analytics/values.yaml` and provide the following values.
 
 | Parameter                       | Description                                                                               |
 |---------------------------------|-------------------------------------------------------------------------------------------|
@@ -74,25 +74,10 @@ b. Open the `<HELM_HOME>/integrator-broker-with-analytics-conf/values.yaml` and
 | `serverIp`                      | NFS Server IP                                                                             |
 | `sharedDeploymentLocationPath`  | NFS shared deployment directory(`<EI_HOME>/repository/deployment`) location for EI        |
 | `sharedTenantsLocationPath`     | NFS shared tenants directory(`<EI_HOME>/repository/tenants`) location for EI              |
-| `analytics1DataLocationPath`    | NFS volume for Indexed data for Analytics node 1(`<DAS_HOME>/repository/data`)            |
-| `analytics2DataLocationPath`    | NFS volume for Indexed data for Analytics node 2(`<DAS_HOME>/repository/data`)            |
-| `analytics1LocationPath`        | NFS volume for Analytics data for Analytics node 1(`<DAS_HOME>/repository/analytics`)     |
-| `analytics2LocationPath`        | NFS volume for Analytics data for Analytics node 2(`<DAS_HOME>/repository/analytics`)     |
+| `brokerSharedDeploymentLocationPath` | NFS shared deployment directory (`<EI_HOME>/wso2/broker/repository/deployment/`) location for Broker |
 
-c. Open the `<HELM_HOME>/integrator-broker-with-analytics-deployment/values.yaml` and provide the following values. 
-
-| Parameter                       | Description                                                                               |
-|---------------------------------|-------------------------------------------------------------------------------------------|
-| `namespace`                     | Kubernetes Namespace in which the resources are deployed                                  |
-| `svcaccount`                    | Kubernetes Service Account in the `namespace` to which product instance pods are attached |
-
-##### 4. Deploy the configurations.
 
-```
-helm install --name <RELEASE_NAME> <HELM_HOME>/integrator-broker-with-analytics-conf
-```
-
-##### 5. Deploy product database(s) using MySQL in Kubernetes.
+##### 4. Deploy product database(s) using MySQL in Kubernetes.
 
 ```
 helm install --name wso2ei-integrator-broker-with-analytics-rdbms-service -f <HELM_HOME>/mysql/values.yaml stable/mysql --namespace <NAMESPACE>
@@ -102,15 +87,17 @@ helm install --name wso2ei-integrator-broker-with-analytics-rdbms-service -f <HE
 
 For a serious deployment (e.g. production grade setup), it is recommended to connect product instances to a user owned and managed RDBMS instance.
 
-##### 6. Deploy WSO2 Enterprise Integrator and Broker with Analytics.
+##### 5. Deploy WSO2 Enterprise Integrator and Broker with Analytics.
 
 ```
-helm install --name <RELEASE_NAME> <HELM_HOME>/integrator-broker-with-analytics-deployment
+helm install --name <RELEASE_NAME> <HELM_HOME>/integrator-broker-with-analytics --namespace <NAMESPACE>
 ```
 
-##### 7. Access product management consoles.
+`NAMESPACE` should be same as in `step 3.b`.
+
+##### 6. Access product management consoles.
 
-Default deployment will expose `wso2ei-integrator`, `wso2ei-broker`, `wso2ei-integrator-gateway` and `wso2ei-analytics` hosts.
+Default deployment will expose `wso2ei-integrator`, `wso2ei-broker`, `wso2ei-integrator-gateway` and `wso2ei-analytics-dashboard` hosts.
 
 To access the console in the environment,
 
@@ -123,7 +110,7 @@ e.g.
 
 ```
 NAME                                        HOSTS                       ADDRESS        PORTS     AGE
-wso2ei-analytics-ingress                    wso2ei-analytics            <EXTERNAL-IP>  80, 443   2m
+wso2ei-analytics-dashboard-ingress          wso2ei-analytics-dashboard  <EXTERNAL-IP>  80, 443   2m
 wso2ei-integrator-gateway-tls-ingress       wso2ei-integrator-gateway   <EXTERNAL-IP>  80, 443   2m
 wso2ei-integrator-ingress                   wso2ei-integrator           <EXTERNAL-IP>  80, 443   2m
 wso2ei-mb-ingress                           wso2ei-broker               <EXTERNAL-IP>  80, 443   2m
@@ -132,10 +119,10 @@ wso2ei-mb-ingress                           wso2ei-broker               <EXTERNA
 b. Add the above host as an entry in /etc/hosts file as follows:
 
 ```
-<EXTERNAL-IP>	wso2ei-analytics
+<EXTERNAL-IP>	wso2ei-analytics-dashboard
 <EXTERNAL-IP>	wso2ei-integrator-gateway
 <EXTERNAL-IP>	wso2ei-integrator
 <EXTERNAL-IP>	wso2ei-broker
 ```
 
-c. Try navigating to `https://wso2ei-integrator/carbon`, `https://wso2ei-broker/carbon` and `https://wso2ei-analytics/carbon` from your favorite browser.
+c. Try navigating to `https://wso2ei-integrator/carbon`, `https://wso2ei-broker/carbon` and `https://wso2ei-analytics-dashboard/portal` from your favorite browser.