X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fmonitoring.py;h=9cf2a3b59f015cde473b12e39590bef1ba05c653;hb=c721f28bf74f3486ee7ca921be485233f5cad44c;hp=2e1e0418eeb586890c2039845ad8596448b6de3a;hpb=a5aeb3780d2fa9f7dc13c28d97df2f4c5c087af7;p=osm%2Fvim-emu.git diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py index 2e1e041..9cf2a3b 100755 --- a/src/emuvim/dcemulator/monitoring.py +++ b/src/emuvim/dcemulator/monitoring.py @@ -45,7 +45,10 @@ class to read openflow stats from the Ryu controller of the DCNetwork """ PUSHGATEWAY_PORT = 9091 -CADVISOR_PORT = 8080 +# we cannot use port 8080 because ryu-ofrest api is already using that one +CADVISOR_PORT = 8081 + +COOKIE_MASK = 0xffffffff class DCNetworkMonitor(): def __init__(self, net): @@ -96,8 +99,8 @@ class DCNetworkMonitor(): # helper tools # cAdvisor, Prometheus pushgateway are started as external container, to gather monitoring metric in son-emu - self.start_PushGateway() - self.start_cAdvisor() + self.pushgateway_process = self.start_PushGateway() + self.cadvisor_process = self.start_cAdvisor() # first set some parameters, before measurement can start @@ -245,7 +248,6 @@ class DCNetworkMonitor(): network_metric['metric_key'] = metric self.monitor_lock.acquire() - self.network_metrics.append(network_metric) self.monitor_lock.release() @@ -330,9 +332,6 @@ class DCNetworkMonitor(): return 'Error stopping monitoring metric: {0} on {1}:{2}'.format(metric, vnf_name, vnf_interface) - - - # get all metrics defined in the list and export it to Prometheus def get_flow_metrics(self): while self.start_monitoring: @@ -343,7 +342,7 @@ class DCNetworkMonitor(): data = {} data['cookie'] = flow_dict['cookie'] - data['cookie_mask'] = flow_dict['cookie'] + data['cookie_mask'] = COOKIE_MASK if 'tx' in flow_dict['metric_key']: data['match'] = {'in_port':flow_dict['mon_port']} @@ -380,7 +379,12 @@ class DCNetworkMonitor(): # query Ryu ret = self.net.ryu_REST('stats/port', dpid=dpid) - port_stat_dict = ast.literal_eval(ret) + if isinstance(ret, dict): + port_stat_dict = ret + elif isinstance(ret, basestring): + port_stat_dict = ast.literal_eval(ret.rstrip()) + else: + port_stat_dict = None metric_list = [metric_dict for metric_dict in self.network_metrics if int(metric_dict['switch_dpid'])==int(dpid)] @@ -421,11 +425,10 @@ class DCNetworkMonitor(): metric_dict['previous_measurement'] = int(port_stat[metric_key]) metric_dict['previous_monitor_time'] = port_uptime # do first measurement - time.sleep(1) - self.monitor_lock.release() - - metric_rate = self.get_network_metrics() - return metric_rate + #time.sleep(1) + #self.monitor_lock.release() + # rate cannot be calculated yet (need a first measurement) + metric_rate = None else: time_delta = (port_uptime - metric_dict['previous_monitor_time']) @@ -433,9 +436,11 @@ class DCNetworkMonitor(): metric_dict['previous_measurement'] = this_measurement metric_dict['previous_monitor_time'] = port_uptime - return metric_rate + return logging.exception('metric {0} not found on {1}:{2}'.format(metric_key, vnf_name, vnf_interface)) + logging.exception('monport:{0}, dpid:{1}'.format(mon_port, switch_dpid)) + logging.exception('port dict:{0}'.format(port_stat_dict)) return 'metric {0} not found on {1}:{2}'.format(metric_key, vnf_name, vnf_interface) def set_flow_metric(self, metric_dict, flow_stat_dict): @@ -455,8 +460,9 @@ class DCNetworkMonitor(): elif 'packet' in metric_key: counter += flow_stat['packet_count'] - flow_stat = flow_stat_dict[str(switch_dpid)][0] - flow_uptime = flow_stat['duration_sec'] + flow_stat['duration_nsec'] * 10 ** (-9) + # flow_uptime disabled for now (can give error) + #flow_stat = flow_stat_dict[str(switch_dpid)][0] + #flow_uptime = flow_stat['duration_sec'] + flow_stat['duration_nsec'] * 10 ** (-9) self.prom_metrics[metric_dict['metric_key']]. \ labels({'vnf_name': vnf_name, 'vnf_interface': vnf_interface, 'flow_id': cookie}). \ @@ -467,7 +473,7 @@ class DCNetworkMonitor(): logging.warning("Pushgateway not reachable: {0} {1}".format(Exception, e)) - def start_Prometheus(self, port=CADVISOR_PORT): + def start_Prometheus(self, port=9090): # prometheus.yml configuration file is located in the same directory as this file cmd = ["docker", "run", @@ -487,13 +493,14 @@ class DCNetworkMonitor(): "-d", "-p", "{0}:9091".format(port), "--name", "pushgateway", + "--label", 'com.containernet=""', "prom/pushgateway" ] logging.info('Start Prometheus Push Gateway container {0}'.format(cmd)) return Popen(cmd) - def start_cAdvisor(self, port=8080): + def start_cAdvisor(self, port=CADVISOR_PORT): cmd = ["docker", "run", "--rm", @@ -503,6 +510,7 @@ class DCNetworkMonitor(): "--volume=/var/lib/docker/:/var/lib/docker:ro", "--publish={0}:8080".format(port), "--name=cadvisor", + "--label",'com.containernet=""', "google/cadvisor:latest" ] logging.info('Start cAdvisor container {0}'.format(cmd)) @@ -521,19 +529,18 @@ class DCNetworkMonitor(): self.prometheus_process.terminate() self.prometheus_process.kill() self._stop_container('prometheus') - + ''' if self.pushgateway_process is not None: logging.info('stopping pushgateway container') - self.pushgateway_process.terminate() - self.pushgateway_process.kill() + #self.pushgateway_process.terminate() + #self.pushgateway_process.kill() self._stop_container('pushgateway') if self.cadvisor_process is not None: logging.info('stopping cadvisor container') - self.cadvisor_process.terminate() - self.cadvisor_process.kill() + #self.cadvisor_process.terminate() + #self.cadvisor_process.kill() self._stop_container('cadvisor') - ''' def switch_tx_rx(self,metric=''): # when monitoring vnfs, the tx of the datacenter switch is actually the rx of the vnf @@ -546,13 +553,10 @@ class DCNetworkMonitor(): return metric def _stop_container(self, name): - cmd = ["docker", - "stop", - name] - Popen(cmd).wait() cmd = ["docker", "rm", + "-f", name] Popen(cmd).wait()