From 604bfec3622d49289d941182c17d4afecf41efac Mon Sep 17 00:00:00 2001 From: Bryan Sullivan Date: Thu, 7 Dec 2017 07:21:58 -0800 Subject: Fix grafana port display JIRA: MODELS-2 Change-Id: I558dd87f861774ffb5abbd376585b5cc7bc68206 Signed-off-by: Bryan Sullivan --- tools/kubernetes/README.md | 8 ++++---- tools/kubernetes/demo_deploy.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/kubernetes/README.md b/tools/kubernetes/README.md index ce20cfb..655e743 100644 --- 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 * when done, these demo elements are available * Helm-deployed demo app dokuwiki, at the assigned node port on any k8s cluster node (e.g. http://$NODE_IP:$NODE_PORT) - * Cloudify-deployed demo app nginx at http://$k8s_master:$port + * Cloudify-deployed demo app nginx at http://$k8s_master:$(assigned node port) * Prometheus UI at http://$k8s_master:9090 - * Grafana dashboards at http://$ves_grafana_host - * Grafana API at http://$ves_grafana_auth@$ves_grafana_host/api/v1/query?query= + * Grafana dashboards at http://$ves_grafana_host:3000 + * Grafana API at http://$ves_grafana_auth@$ves_grafana_host:3000/api/v1/query?query= * Kubernetes API at https://$k8s_master:6443/api/v1/ * Cloudify API at (example): curl -u admin:admin --header 'Tenant: default_tenant' http://$k8s_master/api/v3.1/status -See comments in [setup script](k8s-cluster.sh) and other scripts in the for more info. +See comments in [setup script](k8s-cluster.sh) and the other scripts for more info. This is a work in progress! diff --git a/tools/kubernetes/demo_deploy.sh b/tools/kubernetes/demo_deploy.sh index b285198..7fe8060 100644 --- 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=" +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=" 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" -- cgit 1.2.3-korg