projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Feature 10339 - Enhanced Alarm Mgmt. (SOL005 FM Interface)
[osm/MON.git]
/
osm_mon
/
collector
/
vnf_collectors
/
juju.py
diff --git
a/osm_mon/collector/vnf_collectors/juju.py
b/osm_mon/collector/vnf_collectors/juju.py
index
ba17d65
..
7e639b5
100644
(file)
--- a/
osm_mon/collector/vnf_collectors/juju.py
+++ b/
osm_mon/collector/vnf_collectors/juju.py
@@
-40,8
+40,8
@@
class VCACollector(BaseCollector):
super().__init__(config)
self.common_db = CommonDbClient(config)
self.loop = asyncio.get_event_loop()
super().__init__(config)
self.common_db = CommonDbClient(config)
self.loop = asyncio.get_event_loop()
- host = config.get("vca", "host")
- port = config.get("vca", "port") if "port" in config.conf["vca"] else 17070
+
#
host = config.get("vca", "host")
+
#
port = config.get("vca", "port") if "port" in config.conf["vca"] else 17070
# Backwards compatibility
if "cacert" in config.conf["vca"]:
# Backwards compatibility
if "cacert" in config.conf["vca"]:
@@
-61,9
+61,6
@@
class VCACollector(BaseCollector):
fs=object(),
log=log,
loop=self.loop,
fs=object(),
log=log,
loop=self.loop,
- url="{}:{}".format(host, port),
- username=config.get("vca", "user"),
- vca_config=config.conf["vca"],
on_update_db=None,
)
on_update_db=None,
)
@@
-99,7
+96,9
@@
class VCACollector(BaseCollector):
continue
measures = self.loop.run_until_complete(
self.n2vc.get_metrics(
continue
measures = self.loop.run_until_complete(
self.n2vc.get_metrics(
- vca_deployment_info["model"], vca_deployment_info["application"]
+ vca_deployment_info["model"],
+ vca_deployment_info["application"],
+ vca_id=vnfr.get("vca-id"),
)
)
log.debug("Measures: %s", measures)
)
)
log.debug("Measures: %s", measures)
@@
-125,7
+124,9
@@
class VCACollector(BaseCollector):
return metrics
measures = self.loop.run_until_complete(
self.n2vc.get_metrics(
return metrics
measures = self.loop.run_until_complete(
self.n2vc.get_metrics(
- vca_deployment_info["model"], vca_deployment_info["application"]
+ vca_deployment_info["model"],
+ vca_deployment_info["application"],
+ vca_id=vnfr.get("vca-id"),
)
)
# Search for Mgmt VDU name, needed to query Prometheus based on alarm tags
)
)
# Search for Mgmt VDU name, needed to query Prometheus based on alarm tags