Commit 10d66dbb authored by Carlos Natalino's avatar Carlos Natalino
Browse files

Initial version of WebUI with grafana.

parent 9dde8747

configure_dashboards.sh

+6 −9
Original line number Diff line number Diff line
@@ -22,11 +22,15 @@ INFLUXDB_USER=$(kubectl --namespace $K8S_NAMESPACE get secrets influxdb-secrets 
INFLUXDB_PASSWORD=$(kubectl --namespace $K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_ADMIN_PASSWORD}' | base64 --decode)

INFLUXDB_DATABASE=$(kubectl --namespace $K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_DB}' | base64 --decode)



GRAFANA_HOSTNAME=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')

GRAFANA_PORT=$(kubectl get service webuiservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==3000)].nodePort}')

# GRAFANA_HOSTNAME=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')

# GRAFANA_HOSTNAME=`kubectl get service/webuiservice-public -n ${K8S_NAMESPACE} -o jsonpath='{.spec.clusterIP}'`

GRAFANA_HOSTNAME=`kubectl get nodes --selector=node-role.kubernetes.io/master -o jsonpath='{$.items[*].status.addresses[?(@.type=="InternalIP")].address}'`

# GRAFANA_PORT=$(kubectl get service webuiservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==3000)].nodePort}')

GRAFANA_PORT=`kubectl get service/webuiservice-public -n ${K8S_NAMESPACE} -o jsonpath='{.spec.ports[1].nodePort}'`

GRAFANA_USERNAME="admin"

GRAFANA_PASSWORD=${GRAFANA_PASSWORD:-"admin123+"}

GRAFANA_URL="http://${GRAFANA_USERNAME}:${GRAFANA_PASSWORD}@${GRAFANA_HOSTNAME}:${GRAFANA_PORT}"

echo "Connecting to grafana at URL: ${GRAFANA_URL}..."



# Configure Grafana Admin Password

# Ref: https://grafana.com/docs/grafana/latest/http_api/user/#change-password
@@ -54,12 +58,6 @@ echo 


# Create Monitoring Dashboard

# Ref: https://grafana.com/docs/grafana/latest/http_api/dashboard/

<<<<<<< HEAD

curl -H "Content-Type: application/json" \

  -d '@src/webui/grafana_dashboard.json' \

  ${GRAFANA_URL}/api/dashboards/db

echo

=======

curl -X POST -H "Content-Type: application/json" \

  -d '@src/webui/grafana_dashboard.json' \

  ${GRAFANA_URL}/api/dashboards/db
@@ -68,4 +66,3 @@ echo 
DASHBOARD_URL="${GRAFANA_URL}/api/dashboards/uid/tf-l3-monit"

DASHBOARD_ID=$(python -c 'import json, requests; print(requests.get("'${DASHBOARD_URL}'").json()["dashboard"]["id"])')

curl -X POST ${GRAFANA_URL}/api/user/stars/dashboard/${DASHBOARD_ID}
 
>>>>>>> develop

open_webui.sh

+6 −4
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ 


# this script opens the webui



K8S_NAMESPACE=${K8S_NAMESPACE:-'tf-dev'}



WEBUI_SERVICE_NAME="service/webuiservice-public"

WEBUI_PROTO=`kubectl get ${WEBUI_SERVICE_NAME} -n tf-dev -o jsonpath='{.spec.ports[0].name}'`

WEBUI_IP=`kubectl get ${WEBUI_SERVICE_NAME} -n tf-dev -o jsonpath='{.spec.clusterIP}'`

WEBUI_PORT=`kubectl get ${WEBUI_SERVICE_NAME} -n tf-dev -o jsonpath='{.spec.ports[0].port}'`

GRAFANA_PORT=`kubectl get ${WEBUI_SERVICE_NAME} -n tf-dev -o jsonpath='{.spec.ports[1].port}'`

WEBUI_PROTO=`kubectl get ${WEBUI_SERVICE_NAME} -n ${K8S_NAMESPACE} -o jsonpath='{.spec.ports[0].name}'`

WEBUI_IP=`kubectl get ${WEBUI_SERVICE_NAME} -n ${K8S_NAMESPACE} -o jsonpath='{.spec.clusterIP}'`

WEBUI_PORT=`kubectl get ${WEBUI_SERVICE_NAME} -n ${K8S_NAMESPACE} -o jsonpath='{.spec.ports[0].port}'`

GRAFANA_PORT=`kubectl get ${WEBUI_SERVICE_NAME} -n ${K8S_NAMESPACE} -o jsonpath='{.spec.ports[1].port}'`

URL=${WEBUI_PROTO}://${WEBUI_IP}:${WEBUI_PORT}



echo Opening web UI on URL ${URL}

src/start_webui_dev_mode.sh

+4 −2
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ 


# for development purposes only



export CONTEXTSERVICE_SERVICE_HOST=`kubectl get service/contextservice -n tf-dev -o jsonpath='{.spec.clusterIP}'`

K8S_NAMESPACE=${K8S_NAMESPACE:-'tf-dev'}



export CONTEXTSERVICE_SERVICE_HOST=`kubectl get service/contextservice -n ${K8S_NAMESPACE} -o jsonpath='{.spec.clusterIP}'`



echo Context IP: $CONTEXTSERVICE_SERVICE_HOST



export DEVICESERVICE_SERVICE_HOST=`kubectl get service/deviceservice -n tf-dev -o jsonpath='{.spec.clusterIP}'`

export DEVICESERVICE_SERVICE_HOST=`kubectl get service/deviceservice -n ${K8S_NAMESPACE} -o jsonpath='{.spec.clusterIP}'`



echo Device IP: $DEVICESERVICE_SERVICE_HOST

src/tests/ofc22/run_test_01_bootstrap.sh

+3 −1
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ rm -f $COVERAGEFILE 


# Set the name of the Kubernetes namespace and hostname to use.

K8S_NAMESPACE="ofc22"

K8S_HOSTNAME="kubernetes-master"

# K8S_HOSTNAME="kubernetes-master"

# dynamically gets the name of the K8s master node

K8S_HOSTNAME=`kubectl get nodes --selector=node-role.kubernetes.io/master | tr -s " " | cut -f1 -d" " | sed -n '2 p'`



# Flush Context database

kubectl --namespace $K8S_NAMESPACE exec -it deployment/contextservice --container redis -- redis-cli FLUSHALL

src/tests/ofc22/run_test_02_create_service.sh

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ COVERAGEFILE=$PROJECTDIR/coverage/.coverage 


# Set the name of the Kubernetes namespace and hostname to use.

K8S_NAMESPACE="ofc22"

K8S_HOSTNAME="kubernetes-master"

# dynamically gets the name of the K8s master node

K8S_HOSTNAME=`kubectl get nodes --selector=node-role.kubernetes.io/master | tr -s " " | cut -f1 -d" " | sed -n '2 p'`



export CONTEXTSERVICE_SERVICE_HOST=$(kubectl get node $K8S_HOSTNAME -o 'jsonpath={.status.addresses[?(@.type=="InternalIP")].address}')

export CONTEXTSERVICE_SERVICE_PORT_GRPC=$(kubectl get service contextservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==1010)].nodePort}')