Fix grafana port display

JIRA: MODELS-2

Change-Id: I558dd87f861774ffb5abbd376585b5cc7bc68206
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>

diff --git a/tools/kubernetes/README.md b/tools/kubernetes/README.md
index ce20cfb..655e743 100644 (file)
--- a/tools/kubernetes/README.md
+++ b/tools/kubernetes/README.md
@@ -38,14 +38,14 @@ Here is an overview of the deployment process, which if desired can be completed
     * on each worker, deploy OPNFV Barometer collectd plugin\r
 * when done, these demo elements are available\r
   * Helm-deployed demo app dokuwiki, at the assigned node port on any k8s cluster node (e.g. http://$NODE_IP:$NODE_PORT)\r
-  * Cloudify-deployed demo app nginx at http://$k8s_master:$port\r
+  * Cloudify-deployed demo app nginx at http://$k8s_master:$(assigned node port)\r
   * Prometheus UI at http://$k8s_master:9090\r
-  * Grafana dashboards at http://$ves_grafana_host\r
-  * Grafana API at http://$ves_grafana_auth@$ves_grafana_host/api/v1/query?query=<string>\r
+  * Grafana dashboards at http://$ves_grafana_host:3000\r
+  * Grafana API at http://$ves_grafana_auth@$ves_grafana_host:3000/api/v1/query?query=<string>\r
   * Kubernetes API at https://$k8s_master:6443/api/v1/\r
   * Cloudify API at (example): curl -u admin:admin --header 'Tenant: default_tenant' http://$k8s_master/api/v3.1/status\r
 \r
-See comments in [setup script](k8s-cluster.sh) and other scripts in the for more info.\r
+See comments in [setup script](k8s-cluster.sh) and the other scripts for more info.\r
 \r
 This is a work in progress!\r
 \r

diff --git a/tools/kubernetes/demo_deploy.sh b/tools/kubernetes/demo_deploy.sh
index b285198..7fe8060 100644 (file)
--- a/tools/kubernetes/demo_deploy.sh
+++ b/tools/kubernetes/demo_deploy.sh
@@ -164,7 +164,7 @@ echo "Helm chart demo app dokuwiki is available at http://$NODE_IP:$NODE_PORT/"
 port=$( bash ~/models/tools/cloudify/k8s-cloudify.sh port nginx $k8s_master)
 echo "Cloudify-deployed demo app nginx is available at http://$k8s_master:$port"
 echo "Prometheus UI is available at http://$k8s_master:9090"
-echo "Grafana dashboards are available at http://$ves_grafana_host (login as $ves_grafana_auth)"
-echo "Grafana API is available at http://$ves_grafana_auth@$ves_grafana_host/api/v1/query?query=<string>"
+echo "Grafana dashboards are available at http://$ves_grafana_host:3000 (login as $ves_grafana_auth)"
+echo "Grafana API is available at http://$ves_grafana_auth@$ves_grafana_host:3000/api/v1/query?query=<string>"
 echo "Kubernetes API is available at https://$k8s_master:6443/api/v1/"
 echo "Cloudify API access example: curl -u admin:admin --header 'Tenant: default_tenant' http://$k8s_master/api/v3.1/status"