update network stop command

diff --git a/src/emuvim/api/zerorpc/network.py b/src/emuvim/api/zerorpc/network.py
index ac17e25..8278422 100644 (file)
--- a/src/emuvim/api/zerorpc/network.py
+++ b/src/emuvim/api/zerorpc/network.py
@@ -102,9 +102,9 @@ class DCNetworkApi(object):
 
     # remove the rate measurement for a vnf interface
     def stop_metric(self, vnf_name, vnf_interface, metric):
-        logging.debug("RPC CALL: setup metric")
+        logging.debug("RPC CALL: stop metric")
         try:
-            c = self.net.monitor_agent.remove_metric(vnf_name, vnf_interface, metric)
+            c = self.net.monitor_agent.stop_metric(vnf_name, vnf_interface, metric)
             return c
         except Exception as ex:
             logging.exception("RPC error.")

diff --git a/src/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py
index 55e08f0..14cce08 100755 (executable)
--- a/src/emuvim/cli/monitor.py
+++ b/src/emuvim/cli/monitor.py
@@ -40,7 +40,7 @@ class ZeroRpcClient(object):
     def stop_metric(self, args):\r
         vnf_name = self._parse_vnf_name(args.get("vnf_name"))\r
         vnf_interface = self._parse_vnf_interface(args.get("vnf_name"))\r
-        r = self.c.remove_metric(\r
+        r = self.c.stop_metric(\r
             vnf_name,\r
             vnf_interface,\r
             args.get("metric"))\r

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index 76f67ba..54e7986 100755 (executable)
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -5,7 +5,8 @@ import logging
 from mininet.node import  OVSSwitch\r
 import ast\r
 import time\r
-from prometheus_client import start_http_server, Summary, Histogram, Gauge, Counter, REGISTRY\r
+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, PIPE\r
 import os\r
@@ -25,17 +26,19 @@ class DCNetworkMonitor():
         self.REST_api = 'http://{0}:{1}'.format(self.ip,self.port)\r
 \r
         # helper variables to calculate the metrics\r
+        self.pushgateway = 'localhost:9091'\r
         # Start up the server to expose the metrics to Prometheus.\r
-        start_http_server(8000)\r
+        #start_http_server(8000)\r
         # supported Prometheus metrics\r
+        self.registry = CollectorRegistry()\r
         self.prom_tx_packet_count = Gauge('sonemu_tx_count_packets', 'Total number of packets sent',\r
-                                          ['vnf_name', 'vnf_interface'])\r
+                                          ['vnf_name', 'vnf_interface'], registry=self.registry)\r
         self.prom_rx_packet_count = Gauge('sonemu_rx_count_packets', 'Total number of packets received',\r
-                                          ['vnf_name', 'vnf_interface'])\r
+                                          ['vnf_name', 'vnf_interface'], registry=self.registry)\r
         self.prom_tx_byte_count = Gauge('sonemu_tx_count_bytes', 'Total number of bytes sent',\r
-                                        ['vnf_name', 'vnf_interface'])\r
+                                        ['vnf_name', 'vnf_interface'], registry=self.registry)\r
         self.prom_rx_byte_count = Gauge('sonemu_rx_count_bytes', 'Total number of bytes received',\r
-                                        ['vnf_name', 'vnf_interface'])\r
+                                        ['vnf_name', 'vnf_interface'], registry=self.registry)\r
 \r
         self.prom_metrics={'tx_packets':self.prom_tx_packet_count, 'rx_packets':self.prom_rx_packet_count,\r
                            'tx_bytes':self.prom_tx_byte_count,'rx_bytes':self.prom_rx_byte_count}\r
@@ -53,6 +56,7 @@ class DCNetworkMonitor():
         mon_port = None\r
         }\r
         '''\r
+        self.monitor_lock = threading.Lock()\r
         self.network_metrics = []\r
 \r
         # start monitoring thread\r
@@ -122,7 +126,11 @@ class DCNetworkMonitor():
             network_metric['switch_dpid'] = int(str(next_node.dpid), 16)\r
             network_metric['metric_key'] = metric\r
 \r
+            self.monitor_lock.acquire()\r
+\r
             self.network_metrics.append(network_metric)\r
+            self.monitor_lock.release()\r
+\r
 \r
             logging.info('Started monitoring: {2} on {0}:{1}'.format(vnf_name, vnf_interface, metric))\r
             return 'Started monitoring: {2} on {0}:{1}'.format(vnf_name, vnf_interface, metric)\r
@@ -132,17 +140,48 @@ class DCNetworkMonitor():
             return ex.message\r
 \r
     def stop_metric(self, vnf_name, vnf_interface, metric):\r
+\r
         for metric_dict in self.network_metrics:\r
             if metric_dict['vnf_name'] == vnf_name and metric_dict['vnf_interface'] == vnf_interface \\r
                     and metric_dict['metric_key'] == metric:\r
 \r
+                self.monitor_lock.acquire()\r
+\r
                 self.network_metrics.remove(metric_dict)\r
 \r
                 #this removes the complete metric, all labels...\r
                 #REGISTRY.unregister(self.prom_metrics[metric_dict['metric_key']])\r
+                #self.registry.unregister(self.prom_metrics[metric_dict['metric_key']])\r
+\r
+                for collector in self.registry._collectors :\r
+                    logging.info('name:{0} labels:{1} metrics:{2}'.format(collector._name, collector._labelnames, collector._metrics))\r
+                    """\r
+                    INFO:root:name:sonemu_rx_count_packets\r
+                    labels:('vnf_name', 'vnf_interface')\r
+                    metrics:{(u'tsrc', u'output'): < prometheus_client.core.Gauge\r
+                    object\r
+                    at\r
+                    0x7f353447fd10 >}\r
+                    """\r
+                    logging.info('{0}'.format(collector._metrics.values()))\r
+                    #if self.prom_metrics[metric_dict['metric_key']]\r
+                    if (vnf_name, vnf_interface) in collector._metrics:\r
+                        logging.info('2 name:{0} labels:{1} metrics:{2}'.format(collector._name, collector._labelnames,\r
+                                                                              collector._metrics))\r
+                        #collector._metrics = {}\r
+                        collector.remove(vnf_name, vnf_interface)\r
 \r
                 # set values to NaN, prometheus api currently does not support removal of metrics\r
-                self.prom_metrics[metric_dict['metric_key']].labels(vnf_name, vnf_interface).set(float('nan'))\r
+                #self.prom_metrics[metric_dict['metric_key']].labels(vnf_name, vnf_interface).set(float('nan'))\r
+\r
+                # this removes the complete metric, all labels...\r
+                # 1 single monitor job for all metrics of the SDN controller\r
+                # we can only  remove from the pushgateway grouping keys(labels) which we have defined for the add_to_pushgateway\r
+                # we can not specify labels from the metrics to be removed\r
+                # if we need to remove the metrics seperatelty, we need to give them a separate grouping key, and probably a diffferent registry also\r
+                delete_from_gateway(self.pushgateway, job='sonemu-SDNcontroller')\r
+\r
+                self.monitor_lock.release()\r
 \r
                 logging.info('Stopped monitoring: {2} on {0}:{1}'.format(vnf_name, vnf_interface, metric))\r
                 return 'Stopped monitoring: {2} on {0}:{1}'.format(vnf_name, vnf_interface, metric)\r
@@ -151,6 +190,9 @@ class DCNetworkMonitor():
     # get all metrics defined in the list and export it to Prometheus\r
     def get_network_metrics(self):\r
         while self.start_monitoring:\r
+\r
+            self.monitor_lock.acquire()\r
+\r
             # group metrics by dpid to optimize the rest api calls\r
             dpid_list = [metric_dict['switch_dpid'] for metric_dict in self.network_metrics]\r
             dpid_set = set(dpid_list)\r
@@ -167,6 +209,7 @@ class DCNetworkMonitor():
                 for metric_dict in metric_list:\r
                     self.set_network_metric(metric_dict, port_stat_dict)\r
 \r
+            self.monitor_lock.release()\r
             time.sleep(1)\r
 \r
     # add metric to the list to export to Prometheus, parse the Ryu port-stats reply\r
@@ -187,7 +230,14 @@ class DCNetworkMonitor():
                 #logging.info('set prom packets:{0} {1}:{2}'.format(this_measurement, vnf_name, vnf_interface))\r
 \r
                 # set prometheus metric\r
-                self.prom_metrics[metric_dict['metric_key']].labels(vnf_name, vnf_interface).set(this_measurement)\r
+                self.prom_metrics[metric_dict['metric_key']].\\r
+                    labels({'vnf_name':vnf_name, 'vnf_interface':vnf_interface}).\\r
+                    set(this_measurement)\r
+                #push_to_gateway(self.pushgateway, job='SDNcontroller',\r
+                #                grouping_key={'metric':metric_dict['metric_key']}, registry=self.registry)\r
+\r
+                # 1 single monitor job for all metrics of the SDN controller\r
+                pushadd_to_gateway(self.pushgateway, job='sonemu-SDNcontroller', registry=self.registry)\r
 \r
                 if previous_monitor_time <= 0 or previous_monitor_time >= port_uptime:\r
                     metric_dict['previous_measurement'] = int(port_stat[metric_key])\r
@@ -195,16 +245,17 @@ class DCNetworkMonitor():
                     # do first measurement\r
                     #logging.info('first measurement')\r
                     time.sleep(1)\r
-                    byte_rate = self.get_network_metrics()\r
-                    return byte_rate\r
+                    self.monitor_lock.release()\r
+                    metric_rate = self.get_network_metrics()\r
+                    return metric_rate\r
                 else:\r
                     time_delta = (port_uptime - metric_dict['previous_monitor_time'])\r
-                    byte_rate = (this_measurement - metric_dict['previous_measurement']) / float(time_delta)\r
+                    metric_rate = (this_measurement - metric_dict['previous_measurement']) / float(time_delta)\r
                     # logging.info('uptime:{2} delta:{0} rate:{1}'.format(time_delta,byte_rate,port_uptime))\r
 \r
                 metric_dict['previous_measurement'] = this_measurement\r
                 metric_dict['previous_monitor_time'] = port_uptime\r
-                return byte_rate\r
+                return metric_rate\r
 \r
         logging.exception('metric {0} not found on {1}:{2}'.format(metric_key, vnf_name, vnf_interface))\r
         return 'metric {0} not found on {1}:{2}'.format(metric_key, vnf_name, vnf_interface)\r