Collectd working on VM version

JIRA: VES-1

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

3 files changed, 170 insertions, 128 deletions

diff --git a/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c b/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c
index 6221a02..ecd4961 100644
--- a/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c
+++ b/tests/blueprints/tosca-vnfd-hello-ves/evel_demo.c
@@ -181,48 +181,22 @@ void check_app_container_state() {
  * param[in]  none
  *****************************************************************************/
 
-double cpu(char *id) {
-  double a, b, loadavg;
+double cpu() {
+  double a[4], b[4], loadavg;
   FILE *fp;
   int status;
-  char str[100], save[100];
-  char *cpu;
-  a = 0;
-  b = 0;
 
-  fp = popen("cat /proc/stat", "r");
-  if (fp == NULL) {
-    EVEL_ERROR("popen failed to execute command");
-  }
+  fp = fopen("/proc/stat","r");
+  fscanf(fp,"%*s %lf %lf %lf %lf",&a[0],&a[1],&a[2],&a[3]);
+  fclose(fp);
+  sleep(1);
 
-  while (fgets(str, 100, fp) != NULL) {
-    strcpy(save, str);
-//    printf("line: %s\n", str);
-    cpu = strtok(str, " ");
-    if (strcmp(cpu, id) == 0) {
-      // Sum across user, nice, system, idle
-      strcpy(str, save);
-      a = atof(strtok(NULL, " "));
-      strcpy(str, save);
-      a += atof(strtok(NULL, " "));
-      strcpy(str, save);
-      a += atof(strtok(NULL, " "));
-      strcpy(str, save);
-      b = a + atof(strtok(NULL, " "));
-      loadavg = a/b;
-      printf("Load for %s found: %f\n", id, a/b);
-      break;
-    }
-    else if (strcmp(cpu, "intr") == 0) {
-      loadavg = -1;
-      break;
-    }
-  }
+  fp = fopen("/proc/stat","r");
+  fscanf(fp,"%*s %lf %lf %lf %lf",&b[0],&b[1],&b[2],&b[3]);
+  fclose(fp);
+
+  loadavg = ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));
 
-  status = pclose(fp);
-  if (status == -1) {
-    EVEL_ERROR("pclose returned an error");
-  }
   return(loadavg);
 }
 
@@ -276,22 +250,10 @@ void measure_traffic() {
       memory_configured, memory_used, request_rate);
 
     if (measurement != NULL) {
+      cpu();
       evel_measurement_type_set(measurement, "HTTP request rate");
-      if ((loadavg=cpu("cpu")) != -1) {
-        evel_measurement_agg_cpu_use_set(measurement, loadavg);
-      }
-      if ((loadavg=cpu("cpu0")) != -1) {
-        evel_measurement_cpu_use_add(measurement, "cpu0", loadavg);
-      }
-      if ((loadavg=cpu("cpu1")) != -1) {
-        evel_measurement_cpu_use_add(measurement, "cpu1", loadavg);
-      }
-      if ((loadavg=cpu("cpu2")) != -1) {
-        evel_measurement_cpu_use_add(measurement, "cpu2", loadavg);
-      }
-      if ((loadavg=cpu("cpu3")) != -1) {
-        evel_measurement_cpu_use_add(measurement, "cpu3", loadavg);
-      }
+      evel_measurement_agg_cpu_use_set(measurement, loadavg);
+      evel_measurement_cpu_use_add(measurement, "cpu0", loadavg);
       evel_measurement_fsys_use_add(measurement,"00-11-22",100.11, 100.22, 33,
                                                            200.11, 200.22, 44);
       evel_measurement_fsys_use_add(measurement,"33-44-55",300.11, 300.22, 55,
diff --git a/tests/blueprints/tosca-vnfd-hello-ves/monitor.py b/tests/blueprints/tosca-vnfd-hello-ves/monitor.py
index 5307435..5cc9a09 100644
--- a/tests/blueprints/tosca-vnfd-hello-ves/monitor.py
+++ b/tests/blueprints/tosca-vnfd-hello-ves/monitor.py
@@ -34,13 +34,12 @@ import json
 import jsonschema
 import select
 
-report_time = ""
-requestRate = ""
-vfStatus = ""
+report_time = ''
+requestRate = ''
 monitor_mode = "f"
-summary = ""
-status = ""
-vfStatus = ""
+summary = ['***** Summary of key stats *****','','','']
+status = ['','unknown','unknown','unknown']
+vdu = 0
 base_url = ''
 template_404 = b'''POST {0}'''
 columns = 0
@@ -97,39 +96,39 @@ class PathDispatcher:
 def process_event(e):
   global status
   global summary
-  global vfStatus
 
   epoch = e.event.commonEventHeader.lastEpochMicrosec
 
   report_time = time.strftime('%Y-%m-%d %H:%M:%S', 
                   time.localtime(int(epoch)/1000000))
 
-  domain = e.event.commonEventHeader.domain
-
-  if domain == 'measurementsForVfScaling':
-
-    aggregateCpuUsage = e.event.measurementsForVfScaling.aggregateCpuUsage
-    requestRate = e.event.measurementsForVfScaling.requestRate
-    summary = report_time + " app state: " + vfStatus + ", request rate: " + str(requestRate)
-    if monitor_mode == "c": print '{0} *** app state: {1}\trequest rate: {2}'.format(
-      report_time, vfStatus, str(requestRate))
+  host = e.event.commonEventHeader.reportingEntityName
+  if 'VDU1' in host or 'vdu1' in host: vdu = 1
+  if 'VDU2' in host or 'vdu2' in host: vdu = 2
+  if 'VDU3' in host or 'vdu3' in host: vdu = 3
 
-  if domain == 'fault':
-
-    alarmCondition = e.event.faultFields.alarmCondition
-    specificProblem = e.event.faultFields.specificProblem
-#    vfStatus = e.event.faultFields.vfStatus
-    vfStatus = e.event.faultFields.specificProblem
+  domain = e.event.commonEventHeader.domain
 
-    status = report_time + " app state change: " + specificProblem
-    if monitor_mode == "c": print '{0} *** vfStatus change: {1}'.format(report_time,
-                      specificProblem)
+  if e.event.commonEventHeader.functionalRole == 'vHello_VES agent':
+    if domain == 'measurementsForVfScaling':
+      aggregateCpuUsage = e.event.measurementsForVfScaling.aggregateCpuUsage
+      requestRate = e.event.measurementsForVfScaling.requestRate
+      summary[vdu] = "VDU" + str(vdu) + " state=" + status[vdu] + ", tps=" + str(requestRate) + ", cpu=" + str(aggregateCpuUsage)
+      if monitor_mode == "c": print '{0} *** VDU{1} state={2}, tps={3}'.format(
+        report_time, vdu, status[vdu], str(requestRate))
+
+    if domain == 'fault':
+      alarmCondition = e.event.faultFields.alarmCondition
+      specificProblem = e.event.faultFields.specificProblem
+#    status[vdu] = e.event.faultFields.vfStatus
+      status[vdu] = e.event.faultFields.specificProblem
+      if monitor_mode == "c": print '{0} *** VDU{1} state: {2}'.format(
+        report_time, vdu, status[vdu])
 
 # print_there only works if SSH'd to the VM manually - need to investigate
 #  print_there(1,columns-56,summary)
-  print '{0}'.format(summary)
-#  print_there(2,columns-56,status)
-  print '{0}'.format(status)
+    for s in summary:
+      print '{0}'.format(s)
 
 #--------------------------------------------------------------------------
 # Main monitoring and logging procedure
diff --git a/tests/blueprints/tosca-vnfd-hello-ves/start.sh b/tests/blueprints/tosca-vnfd-hello-ves/start.sh
index 1aa01e8..23f6080 100755
--- a/tests/blueprints/tosca-vnfd-hello-ves/start.sh
+++ b/tests/blueprints/tosca-vnfd-hello-ves/start.sh
@@ -19,11 +19,17 @@
 # Status: this is a work in progress, under test.
 #
 # How to use:
-# $ bash start.sh ID IP username password
-#   ID: username:password to use in REST
-#   IP: IP address of the collector
+# Intended to be invoked from vHello_VES.sh
+# $ bash start.sh type params
+#   type: type of VNF component [webserver|lb|monitor]
+#     webserver params: ID CollectorIP username password
+#     lb params:        ID CollectorIP username password app1_ip app2_ip
+#     collector params: ID CollectorIP username password
+#   ID: VM ID
+#   CollectorIP: IP address of the collector
 #   username: Username for Collector RESTful API authentication
 #   password: Password for Collector RESTful API authentication
+#   app1_ip app2_ip: address of the web servers
 
 setup_agent () {
   echo "$0: Install prerequisites"
@@ -46,31 +52,60 @@ setup_agent () {
   sed -i -- "/api_secure,/{n;s/.*/                      \"$username\",/}" evel-library/code/evel_demo/evel_demo.c
   sed -i -- "/\"hello\",/{n;s/.*/                      \"$password\",/}" evel-library/code/evel_demo/evel_demo.c
 
-  echo "$0: Build agent demo"
+  echo "$0: Build evel_demo agent"
   cd evel-library/bldjobs
   make
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/ubuntu/evel-library/libs/x86_64
   
-  nohup ../output/x86_64/evel_demo --id $agent_id --fqdn $collector_ip --port 30000 --username $username --password $password &
-
-#  echo "$0: Start agent demo, repeat every minute"
-#  crontab -l > /tmp/cron
-#  echo "* * * * 1-5 /home/ubuntu/evel-library/output/x86_64/evel_demo --id $agent_id --fqdn $collector_ip --port 30000 --username $username --password $password" >> /tmp/cron
-#  crontab /tmp/cron
-#  rm /tmp/cron
+  echo "$0: Start evel_demo agent"
+  nohup ../output/x86_64/evel_demo --id $vm_id --fqdn $collector_ip --port 30000 --username $username --password $password > /dev/null 2>&1 &
+
+  echo "$0: Install collectd plugin"
+  cd ~
+  git clone https://github.com/maryamtahhan/OpenStackBarcelonaDemo.git
+  cd OpenStackBarcelonaDemo/ves_plugin
+  host=$(hostname)
+  sed -i -- "s/23380d70-2c71-4e35-99e2-f43f97e4ec65/$vm_id/g" ves_plugin.py
+  sed -i -- "s/cscf0001vm001abc001/$host/g" ves_plugin.py
+  sed -i -- "s/cscf0001vm001oam001/$host/g" ves_plugin.py
+  sed -i -- "s/SGW/$type/" ves_plugin.py
+  sed -i -- "s/reporting_entity_id = \"\"/reporting_entity_id = \"$vm_id\"/g" ves_plugin.py
+  sed -i -- "s/reporting_entity_name = \"cscf0001vm001oam001\"/reporting_entity_name = \"$host\"/g" ves_plugin.py 
+  sed -i -- "s/self.__username = ''/self.__username = 'hello'/g" ves_plugin.py
+  sed -i -- "s/self.__password = ''/self.__password = 'world'/g" ves_plugin.py
+  sed -i -- "s/self.__domain = '127.0.0.1'/self.__domain = '$collector_ip'/g" ves_plugin.py
+  sed -i -- "s/measurementForVfScaling/measurementsForVfScaling/g" ves_plugin.py
+
+  sudo apt-get install -y collectd
+  sudo sed -i -- "s/FQDNLookup true/FQDNLookup false/" /etc/collectd/collectd.conf
+  cat <<EOF | sudo tee -a  /etc/collectd/collectd.conf
+<LoadPlugin python>
+  Globals true
+</LoadPlugin>
+
+<Plugin python>
+  ModulePath "/home/ubuntu/OpenStackBarcelonaDemo/ves_plugin/"
+  LogTraces true
+  Interactive false
+  Import "ves_plugin"
+</Plugin>
+EOF
+  sudo service collectd restart
 }
 
-echo "$0: Setup website and dockerfile"
-mkdir ~/www
-mkdir ~/www/html
+setup_webserver () {
+  echo "$0: Setup website and dockerfile"
+  mkdir ~/www
+  mkdir ~/www/html
 
-# ref: https://hub.docker.com/_/nginx/
-cat > ~/www/Dockerfile <<EOM
+  # ref: https://hub.docker.com/_/nginx/
+  cat > ~/www/Dockerfile <<EOM
 FROM nginx
 COPY html /usr/share/nginx/html
 EOM
 
-cat > ~/www/html/index.html <<EOM
+  host=$(hostname)
+  cat > ~/www/html/index.html <<EOM
 <!DOCTYPE html>
 <html>
 <head>
@@ -82,38 +117,84 @@ body { width: 100%; background-color: white; color: black; padding: 0px; margin:
 </head>
 <body>
 Hello World!<br>
+Welcome to OPNFV @ $host!</large><br/>
 <a href="http://wiki.opnfv.org"><img src="https://www.opnfv.org/sites/all/themes/opnfv/logo.png"></a>
 </body></html>
 EOM
 
-cp ~/ves/tests/blueprints/tosca-vnfd-hello-ves/favicon.ico ~/www/html/favicon.ico
-
-echo "$0: Install docker"
-# Per https://docs.docker.com/engine/installation/linux/ubuntulinux/
-# Per https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04
-sudo apt-get install apt-transport-https ca-certificates
-sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list
-sudo apt-get update
-sudo apt-get purge lxc-docker
-sudo apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-sudo apt-get install -y docker-engine
-
-echo "$0: Get nginx container and start website in docker"
-# Per https://hub.docker.com/_/nginx/
-sudo docker pull nginx
-cd ~/www
-sudo docker build -t vhello .
-sudo docker run --name vHello -d -p 80:80 vhello
-
-echo "$0: setup VES event delivery for the nginx server"
-
-# id=$(sudo ls /var/lib/docker/containers)
-# sudo tail -f /var/lib/docker/containers/$id/$id-json.log 
-
-agent_id=$1
-collector_ip=$2
-username=$3
-password=$4
-
-setup_agent
+  wget https://git.opnfv.org/cgit/ves/plain/tests/blueprints/tosca-vnfd-hello-ves/favicon.ico -O  ~/www/html/favicon.ico
+
+  echo "$0: Install docker"
+  # Per https://docs.docker.com/engine/installation/linux/ubuntulinux/
+  # Per https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04
+  sudo apt-get install apt-transport-https ca-certificates
+  sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+  echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list
+  sudo apt-get update
+  sudo apt-get purge lxc-docker
+  sudo apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
+  sudo apt-get install -y docker-engine
+
+  echo "$0: Get nginx container and start website in docker"
+  # Per https://hub.docker.com/_/nginx/
+  sudo docker pull nginx
+  cd ~/www
+  sudo docker build -t vhello .
+  sudo docker run --name vHello -d -p 80:80 vhello
+
+  echo "$0: setup VES agents"
+  setup_agent
+
+  # Debug hints
+  # id=$(sudo ls /var/lib/docker/containers)
+  # sudo tail -f /var/lib/docker/containers/$id/$id-json.log \
+  }
+
+setup_lb () {
+  echo "$0: setup VES load balancer"
+  echo "$0: install dependencies"
+  sudo apt-get update
+
+  echo "$0: Setup iptables rules"
+  echo "1" | sudo tee /proc/sys/net/ipv4/ip_forward
+  sudo sysctl net.ipv4.ip_forward=1
+  sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -m state --state NEW -m statistic --mode nth --every 2 --packet 0 -j DNAT --to-destination $app1_ip:80
+  sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -m state --state NEW -m statistic --mode nth --every 2 --packet 0 -j DNAT --to-destination $app2_ip:80
+  sudo iptables -t nat -A POSTROUTING -j MASQUERADE
+  # debug hints: list rules (sudo iptables -S -t nat), flush (sudo iptables -F -t nat)
+
+  echo "$0: setup VES agents"
+  setup_agent
+}
+
+setup_monitor () {
+  echo "$0: setup VES Monitor"
+  echo "$0: install dependencies"
+  # Note below: python (2.7) is required due to dependency on module 'ConfigParser'
+  sudo apt-get update
+  sudo apt-get upgrade -y
+  sudo apt-get install -y python python-jsonschema
+
+  echo "$0: setup VES Monitor config"
+  sudo mkdir /var/log/att
+  sudo chown ubuntu /var/log/att
+  touch /var/log/att/collector.log
+  sudo chown ubuntu /home/ubuntu/
+  cd /home/ubuntu/
+  git clone https://github.com/att/evel-test-collector.git
+  sed -i -- "s/vel_username = /vel_username = $username/" evel-test-collector/config/collector.conf
+  sed -i -- "s/vel_password = /vel_password = $password/" evel-test-collector/config/collector.conf
+
+  python monitor.py --config evel-test-collector/config/collector.conf --section default 
+}
+
+type=$1
+vm_id=$2
+collector_ip=$3
+username=$4
+password=$5
+app1_ip=$6
+app2_ip=$7
+
+setup_$type
+exit 0