X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fvnf_collectors%2Fjuju.py;h=1ca8bf591043db6ca94304eab3d495ade2fea202;hb=aa300c9fcfee85f11cedf0957f0406676b995fbc;hp=8f3fa34c2881931bb6bd0432297c53e5ef2c34bb;hpb=e21e44cbf19dcfd8867c085be07a454fc422118d;p=osm%2FMON.git

diff --git a/osm_mon/collector/vnf_collectors/juju.py b/osm_mon/collector/vnf_collectors/juju.py
index 8f3fa34..1ca8bf5 100644
--- a/osm_mon/collector/vnf_collectors/juju.py
+++ b/osm_mon/collector/vnf_collectors/juju.py
@@ -56,7 +56,7 @@ class VCACollector(BaseCollector):
         if vnfr['_admin']['projects_read']:
             tags['project_id'] = vnfr['_admin']['projects_read'][0]
         else:
-            tags['project_id'] = None
+            tags['project_id'] = ''
 
         metrics = []
         for vdur in vnfr['vdur']:
@@ -90,11 +90,19 @@ class VCACollector(BaseCollector):
                 return metrics
             measures = self.loop.run_until_complete(self.n2vc.GetMetrics(vca_deployment_info['model'],
                                                                          vca_deployment_info['application']))
+            # Search for Mgmt VDU name, needed to query Prometheus based on alarm tags
+            # TODO: check a better way to look for Mgmt VDU
+            for vdur in vnfr['vdur']:
+                for interface in vdur['interfaces']:
+                    if 'mgmt-vnf' in interface:
+                        vdu_name = vdur['name']
+                        break
             log.debug('Measures: %s', measures)
             for measure_list in measures.values():
                 for measure in measure_list:
                     log.debug("Measure: %s", measure)
-                    metric = VnfMetric(nsr_id, vnf_member_index, '', measure['key'], float(measure['value']), tags)
+                    metric = VnfMetric(nsr_id, vnf_member_index, vdu_name,
+                                       measure['key'], float(measure['value']), tags)
                     metrics.append(metric)
         return metrics