X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osm_mon%2Fplugins%2FOpenStack%2FAodh%2Fnotifier.py;h=8f3f0fe7643e1cef536808d4d43c1c3951460027;hb=cae650341754311d90bc7c7a0321787b6c0e315a;hp=55178fd00d36d2007d58e53cfa8789d0436751cd;hpb=b85fc8cdf840080b10d01c33b4a57a2a39bcc0f1;p=osm%2FMON.git
diff --git a/osm_mon/plugins/OpenStack/Aodh/notifier.py b/osm_mon/plugins/OpenStack/Aodh/notifier.py
index 55178fd..8f3f0fe 100644
--- a/osm_mon/plugins/OpenStack/Aodh/notifier.py
+++ b/osm_mon/plugins/OpenStack/Aodh/notifier.py
@@ -44,9 +44,7 @@ sys.path.append(os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '
from osm_mon.core.database import DatabaseManager
from osm_mon.core.message_bus.producer import KafkaProducer
-from osm_mon.plugins.OpenStack.common import Common
from osm_mon.plugins.OpenStack.response import OpenStack_Response
-from osm_mon.core.settings import Config
class NotifierHandler(BaseHTTPRequestHandler):
@@ -61,7 +59,6 @@ class NotifierHandler(BaseHTTPRequestHandler):
def do_GET(self):
"""Get request functionality."""
self._set_headers()
- self.wfile.write("
hi!
")
def do_POST(self):
"""POST request function."""
@@ -70,67 +67,49 @@ class NotifierHandler(BaseHTTPRequestHandler):
# Gets the size of data
content_length = int(self.headers['Content-Length'])
post_data = self.rfile.read(content_length)
+ # Python 2/3 string compatibility
try:
post_data = post_data.decode()
except AttributeError:
pass
- self.wfile.write("POST!
")
- log.info("This alarm was triggered: %s", json.loads(post_data))
+ log.info("This alarm was triggered: %s", post_data)
- # Generate a notify_alarm response for the SO
- self.notify_alarm(json.loads(post_data))
+ # Send alarm notification to message bus
+ try:
+ self.notify_alarm(json.loads(post_data))
+ except Exception:
+ log.exception("Error notifying alarm")
def notify_alarm(self, values):
- """Send a notification response message to the SO."""
-
- try:
- # Initialise configuration and authentication for response message
- config = Config.instance()
- config.read_environ()
- response = OpenStack_Response()
- producer = KafkaProducer('alarm_response')
-
- database_manager = DatabaseManager()
-
- alarm_id = values['alarm_id']
- # Get vim_uuid associated to alarm
- creds = database_manager.get_credentials_for_alarm_id(alarm_id, 'openstack')
- auth_token = Common.get_auth_token(creds.uuid)
- endpoint = Common.get_endpoint("alarming", creds.uuid)
-
- # If authenticated generate and send response message
- if auth_token is not None and endpoint is not None:
- url = "{}/v2/alarms/%s".format(endpoint) % alarm_id
-
- # Get the resource_id of the triggered alarm
- result = Common.perform_request(
- url, auth_token, req_type="get")
- alarm_details = json.loads(result.text)
- gnocchi_rule = alarm_details['gnocchi_resources_threshold_rule']
- resource_id = gnocchi_rule['resource_id']
-
- # Process an alarm notification if resource_id is valid
- if resource_id is not None:
- # Get date and time for response message
- a_date = time.strftime("%d-%m-%Y") + " " + time.strftime("%X")
- # Try generate and send response
- try:
- resp_message = response.generate_response(
- 'notify_alarm', a_id=alarm_id,
- r_id=resource_id,
- sev=values['severity'], date=a_date,
- state=values['current'], vim_type="openstack")
- producer.notify_alarm(
- 'notify_alarm', resp_message, 'alarm_response')
- log.info("Sent an alarm response to SO: %s", resp_message)
- except Exception as exc:
- log.exception("Couldn't notify SO of the alarm:")
- else:
- log.warning("No resource_id for alarm; no SO response sent.")
- else:
- log.warning("Authentication failure; SO notification not sent.")
- except:
- log.exception("Could not notify alarm.")
+ """Sends alarm notification message to bus."""
+
+ # Initialise configuration and authentication for response message
+ response = OpenStack_Response()
+ producer = KafkaProducer('alarm_response')
+
+ database_manager = DatabaseManager()
+
+ alarm_id = values['alarm_id']
+ alarm = database_manager.get_alarm(alarm_id, 'openstack')
+ # Process an alarm notification if resource_id is valid
+ # Get date and time for response message
+ a_date = time.strftime("%d-%m-%Y") + " " + time.strftime("%X")
+ # Generate and send response
+ resp_message = response.generate_response(
+ 'notify_alarm',
+ a_id=alarm_id,
+ vdu_name=alarm.vdu_name,
+ vnf_member_index=alarm.vnf_member_index,
+ ns_id=alarm.ns_id,
+ metric_name=alarm.metric_name,
+ operation=alarm.operation,
+ threshold_value=alarm.threshold,
+ sev=values['severity'],
+ date=a_date,
+ state=values['current'])
+ producer.notify_alarm(
+ 'notify_alarm', resp_message)
+ log.info("Sent alarm notification: %s", resp_message)
def run(server_class=HTTPServer, handler_class=NotifierHandler, port=8662):