change cadvisor startup args

[osm/vim-emu.git] / src / emuvim / dcemulator / monitoring.py

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index 28c3df6..3774df4 100755 (executable)
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -34,9 +34,10 @@ import time
 from prometheus_client import start_http_server, Summary, Histogram, Gauge, Counter, REGISTRY, CollectorRegistry, \\r
     pushadd_to_gateway, push_to_gateway, delete_from_gateway\r
 import threading\r
-from subprocess import Popen\r
+from subprocess import Popen, check_call\r
 import os\r
 import docker\r
+import json\r
 \r
 logging.basicConfig(level=logging.INFO)\r
 \r
@@ -89,6 +90,7 @@ class DCNetworkMonitor():
         self.monitor_flow_lock = threading.Lock()\r
         self.network_metrics = []\r
         self.flow_metrics = []\r
+        self.skewmon_metrics = {}\r
 \r
         # start monitoring thread\r
         self.start_monitoring = True\r
@@ -200,7 +202,7 @@ class DCNetworkMonitor():
         network_metric = {}\r
 \r
         # check if port is specified (vnf:port)\r
-        if vnf_interface is None:\r
+        if vnf_interface is None or vnf_interface == '':\r
             # take first interface by default\r
             connected_sw = self.net.DCNetwork_graph.neighbors(vnf_name)[0]\r
             link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]\r
@@ -402,8 +404,10 @@ class DCNetworkMonitor():
         previous_measurement = metric_dict['previous_measurement']\r
         previous_monitor_time = metric_dict['previous_monitor_time']\r
         mon_port = metric_dict['mon_port']\r
-\r
         for port_stat in port_stat_dict[str(switch_dpid)]:\r
+            # ovs output also gives back 'LOCAL' port\r
+            if port_stat['port_no'] == 'LOCAL':\r
+                continue\r
             if int(port_stat['port_no']) == int(mon_port):\r
                 port_uptime = port_stat['duration_sec'] + port_stat['duration_nsec'] * 10 ** (-9)\r
                 this_measurement = int(port_stat[metric_key])\r
@@ -500,7 +504,10 @@ class DCNetworkMonitor():
                "--publish={0}:8080".format(port),\r
                "--name=cadvisor",\r
                "--label",'com.containernet=""',\r
-               "google/cadvisor:latest"\r
+               "google/cadvisor:latest",\r
+               "--storage_duration=1m0s",\r
+               "--allow_dynamic_housekeeping=true",\r
+               #"--housekeeping_interval=1s",\r
                ]\r
         logging.info('Start cAdvisor container {0}'.format(cmd))\r
         return Popen(cmd)\r
@@ -533,7 +540,93 @@ class DCNetworkMonitor():
 \r
     def _stop_container(self, name):\r
 \r
-        container = self.dockercli.containers.get(name)\r
-        container.remove(force=True)\r
+        #container = self.dockercli.containers.get(name)\r
+        #container.stop()\r
+        #container.remove(force=True)\r
+\r
+        # the only robust way to stop these containers is via Popen, it seems\r
+        time.sleep(1)\r
+        cmd = ['docker', 'rm', '-f', name]\r
+        Popen(cmd)\r
+\r
+\r
+    def update_skewmon(self, vnf_name, resource_name, action):\r
+\r
+        ret = ''\r
+\r
+        config_file_path = '/tmp/skewmon.cfg'\r
+        configfile = open(config_file_path, 'a+')\r
+        try:\r
+            config = json.load(configfile)\r
+        except:\r
+            #not a valid json file or empty\r
+            config = {}\r
+\r
+        #initialize config file\r
+        if len(self.skewmon_metrics) == 0:\r
+            config = {}\r
+        json.dump(config, configfile)\r
+        configfile.close()\r
+\r
+        docker_name = 'mn.' + vnf_name\r
+        vnf_container = self.dockercli.containers.get(docker_name)\r
+        key = resource_name + '_' + vnf_container.short_id\r
+        vnf_id = vnf_container.id\r
+\r
+        if action == 'start':\r
+            # add a new vnf to monitor\r
+            config[key] = dict(VNF_NAME=vnf_name,\r
+                                VNF_ID=vnf_id,\r
+                                VNF_METRIC=resource_name)\r
+            ret = 'adding to skewness monitor: {0} {1} '.format(vnf_name, resource_name)\r
+            logging.info(ret)\r
+        elif action == 'stop':\r
+            # remove vnf to monitor\r
+            config.pop(key)\r
+            ret = 'removing from skewness monitor: {0} {1} '.format(vnf_name, resource_name)\r
+            logging.info(ret)\r
+\r
+        self.skewmon_metrics = config\r
+        configfile = open(config_file_path, 'w')\r
+        json.dump(config, configfile)\r
+        configfile.close()\r
+\r
+        try:\r
+            skewmon_container = self.dockercli.containers.get('skewmon')\r
+\r
+            # remove container if config is empty\r
+            if len(config) == 0:\r
+                ret += 'stopping skewness monitor'\r
+                logging.info('stopping skewness monitor')\r
+                skewmon_container.remove(force=True)\r
+\r
+        except docker.errors.NotFound:\r
+            # start container if not running\r
+            ret += 'starting skewness monitor'\r
+            logging.info('starting skewness monitor')\r
+            volumes = {'/sys/fs/cgroup':{'bind':'/sys/fs/cgroup', 'mode':'ro'},\r
+                       '/tmp/skewmon.cfg':{'bind':'/config.txt', 'mode':'ro'}}\r
+            self.dockercli.containers.run('skewmon',\r
+                                          detach=True,\r
+                                          volumes=volumes,\r
+                                          labels=['com.containernet'],\r
+                                          name='skewmon'\r
+                                          )\r
+            # Wait a while for containers to be completely started\r
+            started = False\r
+            wait_time = 0\r
+            while not started:\r
+                list1 = self.dockercli.containers.list(filters={'status': 'running', 'name': 'prometheus'})\r
+                if len(list1) >= 1:\r
+                    time.sleep(1)\r
+                    started = True\r
+                if wait_time > 5:\r
+                    return 'skewmon not started'\r
+                time.sleep(1)\r
+                wait_time += 1\r
+        return ret\r
+\r
+\r
+\r
 \r
 \r