From: khemendra kumar <khemendra.kumar13@gmail.com>
Date: Wed, 20 Nov 2019 14:45:02 +0000 (+0000)
Subject: Merge "logs uCPE updated"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=072b7aef359b6a2ee2fd59af672a1f17c6db3412;hp=f2f2c0eb3a3e1785691dae6f489b1d3a352f98bf;p=eliot.git

Merge "logs uCPE updated"
---

diff --git a/blueprints/iotgateway/scripts/cadvisorsetup.sh b/blueprints/iotgateway/scripts/cadvisorsetup.sh
index 1ceae4a..6903fbe 100644
--- a/blueprints/iotgateway/scripts/cadvisorsetup.sh
+++ b/blueprints/iotgateway/scripts/cadvisorsetup.sh
@@ -8,6 +8,9 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+echo "***********************************************************************"
+echo "cadvisor installation-------------------------------------------STARTED"
+
 HOSTNAME=`hostname`
 sudo docker run  \
  --volume=/:/rootfs:ro \
@@ -20,3 +23,6 @@ sudo docker run  \
  --name=cadvisor-${HOSTNAME} \
  google/cadvisor:latest 
 
+echo "cadvisor setup--------------------------------------------------SUCCESS"
+echo "***********************************************************************"
+
diff --git a/blueprints/iotgateway/scripts/edgex/edgexonk8s.sh b/blueprints/iotgateway/scripts/edgex/edgexonk8s.sh
index 22dd90c..efef947 100755
--- a/blueprints/iotgateway/scripts/edgex/edgexonk8s.sh
+++ b/blueprints/iotgateway/scripts/edgex/edgexonk8s.sh
@@ -11,6 +11,8 @@
 # The script is to setup the Edgex Foundry application as POD in Kubernetes.          #
 #######################################################################################
 
+echo "**********************************************************************"
+echo "Edgex Platform Deployment--------------------------------------STARTED"
 
 echo "Deploying Edgex Platform on IOT-Gateway Edge Node"
 edgexPath=`pwd`
@@ -35,7 +37,8 @@ kubectl expose deployment edgex-support-rulesengine --type=NodePort --name=rules
 kubectl expose deployment edgex-support-logging --type=NodePort --name=loggingnodeport
 kubectl get svc | grep NodePort
 
-
+echo "**********************************************************************"
+echo "Edgex Platform Deployment--------------------------------------SUCCESS"
 
 
 
diff --git a/blueprints/iotgateway/scripts/edgex/verifyedgex.sh b/blueprints/iotgateway/scripts/edgex/verifyedgex.sh
index 95fea1f..c693d30 100644
--- a/blueprints/iotgateway/scripts/edgex/verifyedgex.sh
+++ b/blueprints/iotgateway/scripts/edgex/verifyedgex.sh
@@ -28,7 +28,7 @@ retrytimes=20
 while [ $retrytimes -gt 0 ]
 do
  if [ 12 == "$(kubectl get pods | grep edgex | grep Running | wc -l)" ]; then
-    echo "Edgex Platform is successfully integrated  on ELIOT IOT-Gateway!!!!"
+    echo "Edgex Platform Deployment integration on IOT Gateway---------------------SUCCESS"
     break
  fi
  ((retrytimes-=1))
diff --git a/blueprints/iotgateway/scripts/kubeedge/kubeedge_setup.sh b/blueprints/iotgateway/scripts/kubeedge/kubeedge_setup.sh
index c9633dc..c425b49 100755
--- a/blueprints/iotgateway/scripts/kubeedge/kubeedge_setup.sh
+++ b/blueprints/iotgateway/scripts/kubeedge/kubeedge_setup.sh
@@ -8,6 +8,9 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+echo "**********************************************************************"
+echo "Kubeedge-v1.1.0 Installation------------------------------------------STARTED"
+
 # constants
 
 VERSION="v1.1.0"
@@ -18,8 +21,11 @@ PATH_OF_EDGECORE="/etc/kubeedge-v1.1.0-linux-amd64/edge/edgecore"
 
 initialize_k8s_cluster()
 {
-   source common.sh
-   source k8smaster.sh
+   #cd ../
+   #./setup.sh
+   cp /etc/kubernetes/admin.conf /root/.kube/config
+   #source common.sh
+   #source k8smaster.sh
 }
 
 kubeedge_tar_untar()
@@ -82,7 +88,6 @@ exec_edge()
     echo "exec_edge started"
 
     sshpass -p ${EDGENODEPASSWORD} \
-
     scp -r $KUBEEDGE_ETC \
     ${EDGENODEUSR}@${EDGENODEIP}:/etc
 
@@ -98,6 +103,8 @@ exec_edge()
 apply_node_json()
 {
    echo "apply_node_json started"
+   echo $(pwd)
+   cd ${PATH_OF_KUBEEDGE}
    kubectl apply -f node.json
    echo "apply_node_json ended"
 }
@@ -110,7 +117,7 @@ initialize_k8s_cluster
 
 # sleep added for k8s kube-system pods to be up
 
-sleep 240
+#sleep 240
 
 kubeedge_tar_untar
 
@@ -124,4 +131,5 @@ exec_edge > /dev/null 2>&1
 
 apply_node_json
 
-echo "Kubeedge-v1.1.0 installation completed"
+echo "Kubeedge-v1.1.0 Installation------------------------------------------SUCCESS"
+echo "************************************************************************"
diff --git a/blueprints/iotgateway/scripts/prometheus.sh b/blueprints/iotgateway/scripts/prometheus.sh
index f2a3c17..d12f5e3 100755
--- a/blueprints/iotgateway/scripts/prometheus.sh
+++ b/blueprints/iotgateway/scripts/prometheus.sh
@@ -12,6 +12,11 @@
 PROMETHEUS_HOST_PORT="9090"
 PROMETHEUS_CONTAINTER_PORT="9090"
 #cp ci_management/prometheus.yml $HOME
+
+echo "**********************************************************************"
+echo "Prometheus setup ----------------------------------------------STARTED"
+
+
 source generatePromeyml.sh
 if [ ! -d "/etc/prometheus" ]; then
   sudo mkdir /etc/prometheus
@@ -21,3 +26,6 @@ sudo docker run -p ${PROMETHEUS_HOST_PORT}:${PROMETHEUS_CONTAINTER_PORT} \
      -v ~/prometheus.yml:/etc/prometheus/prometheus.yml \
      -d prom/prometheus \
      --config.file=/etc/prometheus/prometheus.yml 
+
+echo "Prometheus setup ----------------------------------------------SUCCESS"
+echo "**********************************************************************"
diff --git a/blueprints/iotgateway/scripts/setup.sh b/blueprints/iotgateway/scripts/setup.sh
index e1af2bb..7c4190a 100755
--- a/blueprints/iotgateway/scripts/setup.sh
+++ b/blueprints/iotgateway/scripts/setup.sh
@@ -18,6 +18,9 @@
 # sshpass needs to be installed before executing this script.                          #
 ########################################################################################
 
+echo "**********************************************************************"
+echo "ELIOT IOT-Gateway Platform Deployment--------------------------STARTED"
+
 # constants
 
 OSPLATFORM=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
@@ -210,5 +213,6 @@ if [[ $OSPLATFORM = *CentOS* ]]; then
 # Removing the taint from master node
 kubectl taint nodes --all node-role.kubernetes.io/master- || true
 
-echo "ELIOT IOT-Gateway Platform is Successfully Deployed !!!"
+echo "**********************************************************************"
+echo "ELIOT IOT-Gateway Platform Deployment--------------------------SUCCESS"