projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduces kafka log level to WARN
[osm/MON.git]
/
osm_mon
/
plugins
/
CloudWatch
/
plugin_alarm.py
diff --git
a/osm_mon/plugins/CloudWatch/plugin_alarm.py
b/osm_mon/plugins/CloudWatch/plugin_alarm.py
index
c8ca955
..
40e7fe5
100644
(file)
--- a/
osm_mon/plugins/CloudWatch/plugin_alarm.py
+++ b/
osm_mon/plugins/CloudWatch/plugin_alarm.py
@@
-22,19
+22,16
@@
'''
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 io import open
+from osm_mon.core.message_bus.producer import KafkaProducer
+from osm_mon.plugins.CloudWatch.metric_alarms import MetricAlarm
+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 logging
import json
import logging
-from jsmin import jsmin
-from connection import Connection
-from metric_alarms import MetricAlarm
-from metrics import Metrics
-sys.path.append("../../core/message_bus")
-from producer import KafkaProducer
log = logging.getLogger(__name__)
log = logging.getLogger(__name__)
@@
-90,12
+87,12
@@
class plugin_alarms():
log.debug("Alarm Already exists")
payload = json.dumps(config_resp)
file = open('../../core/models/create_alarm_resp.json','wb').write((payload))
log.debug("Alarm Already exists")
payload = json.dumps(config_resp)
file = open('../../core/models/create_alarm_resp.json','wb').write((payload))
- self.producer.
create_alarm_response(key='create_alarm_response',message=payload,topic = 'alarm_response'
)
+ self.producer.
publish_alarm_response(key='create_alarm_response',message=payload
)
else:
payload = json.dumps(config_resp)
file = open('../../core/models/create_alarm_resp.json','wb').write((payload))
else:
payload = json.dumps(config_resp)
file = open('../../core/models/create_alarm_resp.json','wb').write((payload))
- self.producer.
create_alarm_response(key='create_alarm_response',message=payload,topic = 'alarm_response'
)
+ self.producer.
publish_alarm_response(key='create_alarm_response',message=payload
)
log.info("New alarm created with alarm info: %s", config_resp)
else:
log.info("New alarm created with alarm info: %s", config_resp)
else:
@@
-110,7
+107,7
@@
class plugin_alarms():
ack_details = self.get_ack_details(alarm_info)
payload = json.dumps(ack_details)
file = open('../../core/models/notify_alarm.json','wb').write((payload))
ack_details = self.get_ack_details(alarm_info)
payload = json.dumps(ack_details)
file = open('../../core/models/notify_alarm.json','wb').write((payload))
- self.producer.notify_alarm(key='notify_alarm',message=payload
,topic = 'alarm_response'
)
+ self.producer.notify_alarm(key='notify_alarm',message=payload)
log.info("Acknowledge sent: %s", ack_details)
else:
log.info("Acknowledge sent: %s", ack_details)
else:
@@
-130,13
+127,13
@@
class plugin_alarms():
if update_resp == None:
payload = json.dumps(update_resp)
file = open('../../core/models/update_alarm_resp.json','wb').write((payload))
if update_resp == None:
payload = json.dumps(update_resp)
file = open('../../core/models/update_alarm_resp.json','wb').write((payload))
- self.producer.update_alarm_response(key='update_alarm_response',message=payload
,topic = 'alarm_response'
)
+ self.producer.update_alarm_response(key='update_alarm_response',message=payload)
log.debug("Alarm Already exists")
else:
payload = json.dumps(update_resp)
file = open('../../core/models/update_alarm_resp.json','wb').write((payload))
log.debug("Alarm Already exists")
else:
payload = json.dumps(update_resp)
file = open('../../core/models/update_alarm_resp.json','wb').write((payload))
- self.producer.update_alarm_response(key='update_alarm_response',message=payload
,topic = 'alarm_response'
)
+ self.producer.update_alarm_response(key='update_alarm_response',message=payload)
log.info("Alarm Updated with alarm info: %s", update_resp)
else:
log.info("Alarm Updated with alarm info: %s", update_resp)
else:
@@
-149,7
+146,7
@@
class plugin_alarms():
del_resp = self.delete_alarm(del_info)
payload = json.dumps(del_resp)
file = open('../../core/models/delete_alarm_resp.json','wb').write((payload))
del_resp = self.delete_alarm(del_info)
payload = json.dumps(del_resp)
file = open('../../core/models/delete_alarm_resp.json','wb').write((payload))
- self.producer.delete_alarm_response(key='delete_alarm_response',message=payload
,topic = 'alarm_response'
)
+ self.producer.delete_alarm_response(key='delete_alarm_response',message=payload)
log.info("Alarm Deleted with alarm info: %s", del_resp)
log.info("Alarm Deleted with alarm info: %s", del_resp)
@@
-161,7
+158,7
@@
class plugin_alarms():
list_resp = self.get_alarms_list(alarm_info)#['alarm_names']
payload = json.dumps(list_resp)
file = open('../../core/models/list_alarm_resp.json','wb').write((payload))
list_resp = self.get_alarms_list(alarm_info)#['alarm_names']
payload = json.dumps(list_resp)
file = open('../../core/models/list_alarm_resp.json','wb').write((payload))
- self.producer.list_alarm_response(key='list_alarm_response',message=payload
,topic = 'alarm_response'
)
+ self.producer.list_alarm_response(key='list_alarm_response',message=payload)
else:
log.error("Resource ID is Incorrect")
else:
log.error("Resource ID is Incorrect")