X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fmonitoring.py;h=6531bebf919142796f1ea87edb808336d6e952c1;hb=307aa1f4774345d9e9a70c02eeee312ecb1b13cf;hp=54e79869de4c5305f6fafd6a74cdd1956b39cd15;hpb=300e1e54aefeace41e0f2785c82daccb3dc50357;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index 54e7986..6531beb 100755
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -91,7 +91,7 @@ class DCNetworkMonitor():
                 if link_dict[link]['src_port_id'] == vnf_interface:
                     # found the right link and connected switch
                     # logging.info("{0},{1}".format(link_dict[link]['src_port_id'], vnf_source_interface))
-                    network_metric['mon_port'] = link_dict[link]['dst_port']
+                    network_metric['mon_port'] = link_dict[link]['dst_port_nr']
                     break
 
         if 'mon_port' not in network_metric:
@@ -246,12 +246,14 @@ class DCNetworkMonitor():
                     #logging.info('first measurement')
                     time.sleep(1)
                     self.monitor_lock.release()
+
                     metric_rate = self.get_network_metrics()
                     return metric_rate
+
                 else:
                     time_delta = (port_uptime - metric_dict['previous_monitor_time'])
                     metric_rate = (this_measurement - metric_dict['previous_measurement']) / float(time_delta)
-                    # logging.info('uptime:{2} delta:{0} rate:{1}'.format(time_delta,byte_rate,port_uptime))
+                    logging.info('metric: {0} rate:{1}'.format(metric_dict['metric_key'], metric_rate))
 
                 metric_dict['previous_measurement'] = this_measurement
                 metric_dict['previous_monitor_time'] = port_uptime
@@ -274,6 +276,7 @@ class DCNetworkMonitor():
                "--rm",
                "-p", "{0}:9090".format(port),
                "-v", "{0}/prometheus.yml:/etc/prometheus/prometheus.yml".format(os.path.dirname(os.path.abspath(__file__))),
+               "-v", "{0}/profile.rules:/etc/prometheus/profile.rules".format(os.path.dirname(os.path.abspath(__file__))),
                "--name", "prometheus",
                "prom/prometheus"
                ]