projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds more alarm parameters to alarm notification log
[osm/MON.git]
/
osm_mon
/
plugins
/
CloudWatch
/
plugin_metric.py
diff --git
a/osm_mon/plugins/CloudWatch/plugin_metric.py
b/osm_mon/plugins/CloudWatch/plugin_metric.py
index
b6508a5
..
dc687db
100644
(file)
--- a/
osm_mon/plugins/CloudWatch/plugin_metric.py
+++ b/
osm_mon/plugins/CloudWatch/plugin_metric.py
@@
-22,17
+22,13
@@
'''
AWS-Plugin implements all the methods of MON to interact with AWS using the BOTO client
'''
'''
AWS-Plugin implements all the methods of MON to interact with AWS using the BOTO client
'''
+from osm_mon.core.message_bus.producer import KafkaProducer
+from osm_mon.plugins.CloudWatch.metrics import Metrics
__author__ = "Wajeeha Hamid"
__date__ = "18-September-2017"
__author__ = "Wajeeha Hamid"
__date__ = "18-September-2017"
-import sys
import json
import json
-from connection import Connection
-from metric_alarms import MetricAlarm
-from metrics import Metrics
-sys.path.append("../../core/message_bus")
-from producer import KafkaProducer
import logging
log = logging.getLogger(__name__)
import logging
log = logging.getLogger(__name__)
@@
-88,8
+84,8
@@
class plugin_metrics():
log.info("Action required against: %s" % (message.topic))
if message.key == "create_metric_request":
log.info("Action required against: %s" % (message.topic))
if message.key == "create_metric_request":
- if self.check_resource(metric_info['metric_create']['resource_uuid']) == True:
- metric_resp = self.create_metric_request(metric_info['metric_create']) #alarm_info = message.value
+ if self.check_resource(metric_info['metric_create
_request
']['resource_uuid']) == True:
+ metric_resp = self.create_metric_request(metric_info['metric_create
_request
']) #alarm_info = message.value
metric_response['schema_version'] = metric_info['schema_version']
metric_response['schema_type'] = "create_metric_response"
metric_response['metric_create_response'] = metric_resp
metric_response['schema_version'] = metric_info['schema_version']
metric_response['schema_type'] = "create_metric_response"
metric_response['metric_create_response'] = metric_resp
@@
-101,8
+97,8
@@
class plugin_metrics():
return metric_response
elif message.key == "update_metric_request":
return metric_response
elif message.key == "update_metric_request":
- if self.check_resource(metric_info['metric_create']['resource_uuid']) == True:
- update_resp = self.update_metric_request(metric_info['metric_create'])
+ if self.check_resource(metric_info['metric_create
_request
']['resource_uuid']) == True:
+ update_resp = self.update_metric_request(metric_info['metric_create
_request
'])
metric_response['schema_version'] = metric_info['schema_version']
metric_response['schema_type'] = "update_metric_response"
metric_response['metric_update_response'] = update_resp
metric_response['schema_version'] = metric_info['schema_version']
metric_response['schema_type'] = "update_metric_response"
metric_response['metric_update_response'] = update_resp