X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=plugins%2FOpenStack%2FAodh%2Falarming.py;h=d409d71cb4b9103567836fbe412ccfcf49f87eb8;hb=95b92b3dacfd93fa1649a5f87dafd2fa6553a086;hp=c54881a757a17a8e18ee514ea67196456aad9cf8;hpb=d00ff82f2b06b5ae2a353e0f6a9b30d813ffa21f;p=osm%2FMON.git diff --git a/plugins/OpenStack/Aodh/alarming.py b/plugins/OpenStack/Aodh/alarming.py index c54881a..d409d71 100644 --- a/plugins/OpenStack/Aodh/alarming.py +++ b/plugins/OpenStack/Aodh/alarming.py @@ -22,7 +22,8 @@ """Carry out alarming requests via Aodh API.""" import json -import logging as log +import logging +log = logging.getLogger(__name__) from core.message_bus.producer import KafkaProducer @@ -102,10 +103,14 @@ class Alarming(object): # Generate a valid response message, send via producer try: + if alarm_status is True: + log.info("Alarm successfully created") + resp_message = self._response.generate_response( 'create_alarm_response', status=alarm_status, alarm_id=alarm_id, cor_id=alarm_details['correlation_id']) + log.info("Response Message: %s", resp_message) self._producer.create_alarm_response( 'create_alarm_resonse', resp_message, 'alarm_response') @@ -116,34 +121,16 @@ class Alarming(object): # Check for a specifed: alarm_name, resource_uuid, severity # and generate the appropriate list list_details = values['alarm_list_request'] - try: - name = list_details['alarm_name'].lower() - alarm_list = self.list_alarms( - endpoint, auth_token, alarm_name=name) - except Exception as a_name: - log.debug("No name specified for list:%s", a_name) - try: - resource = list_details['resource_uuid'] - alarm_list = self.list_alarms( - endpoint, auth_token, resource_id=resource) - except Exception as r_id: - log.debug("No resource id specified for this list:\ - %s", r_id) - try: - severe = list_details['severity'].lower() - alarm_list = self.list_alarms( - endpoint, auth_token, severity=severe) - except Exception as exc: - log.info("No severity specified for list: %s.\ - will return full list.", exc) - alarm_list = self.list_alarms( - endpoint, auth_token) + + alarm_list = self.list_alarms( + endpoint, auth_token, list_details) try: # Generate and send a list response back resp_message = self._response.generate_response( 'list_alarm_response', alarm_list=alarm_list, cor_id=list_details['correlation_id']) + log.info("Response Message: %s", resp_message) self._producer.list_alarm_response( 'list_alarm_response', resp_message, 'alarm_response') @@ -163,6 +150,7 @@ class Alarming(object): 'delete_alarm_response', alarm_id=alarm_id, status=resp_status, cor_id=request_details['correlation_id']) + log.info("Response message: %s", resp_message) self._producer.delete_alarm_response( 'delete_alarm_response', resp_message, 'alarm_response') @@ -195,6 +183,7 @@ class Alarming(object): 'update_alarm_response', alarm_id=alarm_id, cor_id=alarm_details['correlation_id'], status=status) + log.info("Response message: %s", resp_message) self._producer.update_alarm_response( 'update_alarm_response', resp_message, 'alarm_response') @@ -252,6 +241,7 @@ class Alarming(object): result = self._common._perform_request( url, auth_token, req_type="delete") if str(result.status_code) == "404": + log.info("Alarm doesn't exist: %s", result.status_code) # If status code is 404 alarm did not exist return False else: @@ -261,34 +251,81 @@ class Alarming(object): log.warn("Failed to delete alarm: %s because %s.", alarm_id, exc) return False - def list_alarms(self, endpoint, auth_token, - alarm_name=None, resource_id=None, severity=None): + def list_alarms(self, endpoint, auth_token, list_details): """Generate the requested list of alarms.""" url = "{}/v2/alarms/".format(endpoint) - alarm_list = [] - - result = self._common._perform_request( - url, auth_token, req_type="get") - if result is not None: - # Check for a specified list based on: - # alarm_name, severity, resource_id - if alarm_name is not None: - for alarm in json.loads(result.text): - if alarm_name in str(alarm): - alarm_list.append(str(alarm)) - elif resource_id is not None: - for alarm in json.loads(result.text): - if resource_id in str(alarm): - alarm_list.append(str(alarm)) - elif severity is not None: + a_list, name_list, sev_list, res_list = [], [], [], [] + + # TODO(mcgoughh): for now resource_id is a mandatory field + resource = list_details['resource_uuid'] + + # Checking what fields are specified for a list request + try: + name = list_details['alarm_name'].lower() + if name not in ALARM_NAMES.keys(): + log.warn("This alarm is not supported, won't be used!") + name = None + except KeyError as exc: + log.info("Alarm name isn't specified.") + name = None + + try: + severity = list_details['severity'].lower() + sev = SEVERITIES[severity] + except KeyError as exc: + log.info("Severity is unspecified/incorrectly configured") + sev = None + + # Perform the request to get the desired list + try: + result = self._common._perform_request( + url, auth_token, req_type="get") + + if result is not None: + # Get list based on resource id for alarm in json.loads(result.text): - if severity in str(alarm): - alarm_list.append(str(alarm)) + rule = alarm['gnocchi_resources_threshold_rule'] + if resource == rule['resource_id']: + res_list.append(str(alarm)) + if not res_list: + log.info("No alarms for this resource") + return a_list + + # Generate specified listed if requested + if name is not None and sev is not None: + log.info("Return a list of %s alarms with %s severity.", + name, sev) + for alarm in json.loads(result.text): + if name == alarm['name']: + name_list.append(str(alarm)) + for alarm in json.loads(result.text): + if sev == alarm['severity']: + sev_list.append(str(alarm)) + name_sev_list = list(set(name_list).intersection(sev_list)) + a_list = list(set(name_sev_list).intersection(res_list)) + elif name is not None: + log.info("Returning a %s list of alarms.", name) + for alarm in json.loads(result.text): + if name == alarm['name']: + name_list.append(str(alarm)) + a_list = list(set(name_list).intersection(res_list)) + elif sev is not None: + log.info("Returning %s severity alarm list.", sev) + for alarm in json.loads(result.text): + if sev == alarm['severity']: + sev_list.append(str(alarm)) + a_list = list(set(sev_list).intersection(res_list)) + else: + log.info("Returning an entire list of alarms.") + a_list = res_list else: - alarm_list = result.text - else: + log.info("There are no alarms!") + + except Exception as exc: + log.info("Failed to generate required list: %s", exc) return None - return alarm_list + + return a_list def update_alarm_state(self, endpoint, auth_token, alarm_id): """Set the state of an alarm to ok when ack message is received."""