X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vnfs%2FDAaaS%2FREADME.md;h=93e4ce975123c21c31e529256686d2dec2966f50;hb=d11cb99fb101a6798fd57fa44d332737d6637e75;hp=302cdd6e294af2940d9cce9b1489c1ac2f4087cf;hpb=c3ef7c3f40f6aa4a14a98301ae12bfa11b1a12c3;p=demo.git

diff --git a/vnfs/DAaaS/README.md b/vnfs/DAaaS/README.md
index 302cdd6e..93e4ce97 100644
--- a/vnfs/DAaaS/README.md
+++ b/vnfs/DAaaS/README.md
@@ -13,6 +13,31 @@ git clone https://github.com/onap/demo.git
 DA_WORKING_DIR=$PWD/demo/vnfs/DAaaS/deploy
 ```
 
+## Install Istio Service Mesh
+
+## Istio is installed in two Steps
+```bash
+1. Istio-Operator
+2. Istio-config
+```
+
+## Download the Istio Installation repo
+
+```bash
+cd $DA_WORKING_DIR/00-init
+helm install --name=istio-operator istio-operator --namespace=istio-system
+cd $DA_WORKING_DIR/00-init/istio
+helm install --name istio istio-instance --namespace istio-system
+```
+
+## Install Metallb to act as a Loadbalancer
+```bash
+cd  $DA_WORKING_DIR/00-init
+NOTE: Update the IP Address Ranges before you Install Metallb
+NOTE: If you are using a single IP, use <IP>/32 format
+helm install --name metallb metallb --namespace metallb-system
+```
+
 ## Install Rook-Ceph for Persistent Storage
 Note: This is unusual but Flex volume path can be different than the default value. values.yaml has the most common flexvolume path configured. In case of errors related to flexvolume please refer to the https://rook.io/docs/rook/v0.9/flexvolume.html#configuring-the-flexvolume-path to find the appropriate flexvolume-path and set it in values.yaml
 ```bash
@@ -56,7 +81,7 @@ kubectl get crds | grep rook
 ```
 If this return results like :
 ```
-otc@otconap7 /var/lib/rook $  kc get crds | grep rook
+otc@otconap7 /var/lib/rook $  kubectl get crds | grep rook
 cephblockpools.ceph.rook.io         2019-07-19T18:19:05Z
 cephclusters.ceph.rook.io           2019-07-19T18:19:05Z
 cephfilesystems.ceph.rook.io        2019-07-19T18:19:05Z
@@ -68,7 +93,7 @@ then you should delete these previously existing rook based CRDs by generating a
 manifest file by these commands and then deleting those files:
 ```
 helm template -n rook . -f values.yaml > ~/delete.yaml
-kc delete -f ~/delete.yaml
+kubectl delete -f ~/delete.yaml
 ```
 
 After this, delete the below directory in all the nodes.
@@ -92,16 +117,16 @@ IMAGE_NAME=dcr.cluster.local:32644/collectd-operator:latest
 ```
 #### visualization-operator
 ```bash
-cd $DA_WORKING_DIR/../microservices/visualization-operator
+cd $DA_WORKING_DIR/../microservices
 
 ## Note: The image tag and respository in the Visualization-operator helm charts needs to match the IMAGE_NAME
 IMAGE_NAME=dcr.cluster.local:32644/visualization-operator:latest
-./build/build_image.sh $IMAGE_NAME
+./build_image.sh visualization-operator $IMAGE_NAME
 ```
 
 ### Install the Operator Package
 ```bash
-cd $DA_WORKING_DIR/operator
+cd $DA_WORKING_DIR/deploy/operator
 helm install -n operator . -f values.yaml --namespace=operator
 ```
 Check for the status of the pods in operator namespace. Check if Prometheus operator pods are in Ready state.
@@ -134,7 +159,7 @@ Note: Collectd.conf is avaliable in $DA_WORKING_DIR/collection/charts/collectd/r
 ```bash
 Default (For custom collectd skip this section)
 =======
-cd $DA_WORKING_DIR/collection
+cd $DA_WORKING_DIR/deploy/collection
 helm install -n cp . -f values.yaml --namespace=edge1
 
 Custom Collectd
@@ -192,6 +217,50 @@ kubectl create -f edge1 [PLUGIN_NAME2]_collectdplugin_cr.yaml
 kubectl create -f edge1 [PLUGIN_NAME3]_collectdplugin_cr.yaml
 ...
 ```
+
+#Install visualization package
+```bash
+Default (For custom Grafana dashboards skip this section)
+=======
+cd $DA_WORKING_DIR/visualization
+helm install -n viz . -f values.yaml -f grafana-values.yaml
+
+Custom Grafana dashboards
+=========================
+1. Place the custom dashboard definition into the folder $DA_WORKING_DIR/visualization/charts/grafana/dashboards
+    Example dashboard definition can be found at $DA_WORKING_DIR/visualization/charts/grafana/dashboards/dashboard1.json
+2. Create a configmap.yaml that imports above created dashboard.json file as config and copy that configmap.yaml to $DA_WORKING_DIR/visualization/charts/grafana/templates/
+    Example configmap can be found at $DA_WORKING_DIR/visualization/charts/grafana/templates/configmap-add-dashboard.yaml
+3. Add custom dashboard configuration to values.yaml or an overriding values.yaml. 
+    Example configuration can be found in the "dashboardProviders" section of grafana-values.yaml
+
+4. cd $DA_WORKING_DIR/visualization
+5. For a fresh install of visualization package, do "helm install"
+    e.g., helm install -n viz . -f values.yaml -f grafana-values.yaml
+   If the custom dashboard is being added to an already running Grafana, do "helm upgrade"
+    e.g., helm upgrade -n viz . -f values.yaml -f grafana-values.yaml -f ......
+```
+
+#### Verify Visualization package
+Check if the visualization pod is up
+```
+$ kubectl get pods
+    NAME                          READY   STATUS    RESTARTS   AGE
+    viz-grafana-78dcffd75-sxnjv   1/1     Running   0          52m
+```
+
+### Login to Grafana
+```
+1. Get your 'admin' user password by running:
+    kubectl get secret --namespace default viz-grafana -o jsonpath="{.data.admin-password}" | base64 --decode ; echo
+
+2. Get the Grafana URL to visit by running these commands in the same shell:
+    export POD_NAME=$(kubectl get pods --namespace default -l "app=grafana,release=viz" -o jsonpath="{.items[0].metadata.name}")
+    kubectl --namespace default port-forward $POD_NAME 3000
+
+3. Visit the URL : http://localhost:3000 and login with the password from step 1 and the username: admin
+```
+
 #### Configure Grafana Datasources
 Using the sample [prometheus_grafanadatasource_cr.yaml](microservices/visualization-operator/examples/grafana/prometheus_grafanadatasource_cr.yaml), Configure the GrafanaDataSource CR by running the command below
 ```yaml