projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PM] Adds support for logstash
[osm/MON.git]
/
osm_mon
/
plugins
/
OpenStack
/
Aodh
/
notifier.py
diff --git
a/osm_mon/plugins/OpenStack/Aodh/notifier.py
b/osm_mon/plugins/OpenStack/Aodh/notifier.py
index
c09ad9e
..
f7d50a8
100644
(file)
--- a/
osm_mon/plugins/OpenStack/Aodh/notifier.py
+++ b/
osm_mon/plugins/OpenStack/Aodh/notifier.py
@@
-61,7
+61,6
@@
class NotifierHandler(BaseHTTPRequestHandler):
def do_GET(self):
"""Get request functionality."""
self._set_headers()
def do_GET(self):
"""Get request functionality."""
self._set_headers()
- self.wfile.write("<html><body><h1>hi!</h1></body></html>")
def do_POST(self):
"""POST request function."""
def do_POST(self):
"""POST request function."""
@@
-70,7
+69,10
@@
class NotifierHandler(BaseHTTPRequestHandler):
# Gets the size of data
content_length = int(self.headers['Content-Length'])
post_data = self.rfile.read(content_length)
# Gets the size of data
content_length = int(self.headers['Content-Length'])
post_data = self.rfile.read(content_length)
- self.wfile.write("<html><body><h1>POST!</h1></body></tml>")
+ try:
+ post_data = post_data.decode()
+ except AttributeError:
+ pass
log.info("This alarm was triggered: %s", json.loads(post_data))
# Generate a notify_alarm response for the SO
log.info("This alarm was triggered: %s", json.loads(post_data))
# Generate a notify_alarm response for the SO
@@
-117,14
+119,14
@@
class NotifierHandler(BaseHTTPRequestHandler):
sev=values['severity'], date=a_date,
state=values['current'], vim_type="openstack")
producer.notify_alarm(
sev=values['severity'], date=a_date,
state=values['current'], vim_type="openstack")
producer.notify_alarm(
- 'notify_alarm', resp_message
, 'alarm_response'
)
+ 'notify_alarm', resp_message)
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.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.warn("No resource_id for alarm; no SO response sent.")
+ log.warn
ing
("No resource_id for alarm; no SO response sent.")
else:
else:
- log.warn("Authentication failure; SO notification not sent.")
+ log.warn
ing
("Authentication failure; SO notification not sent.")
except:
log.exception("Could not notify alarm.")
except:
log.exception("Could not notify alarm.")
@@
-138,7
+140,7
@@
def run(server_class=HTTPServer, handler_class=NotifierHandler, port=8662):
log.info("Starting alarm notifier server on port: %s", port)
httpd.serve_forever()
except Exception as exc:
log.info("Starting alarm notifier server on port: %s", port)
httpd.serve_forever()
except Exception as exc:
- log.warn("Failed to start webserver, %s", exc)
+ log.warn
ing
("Failed to start webserver, %s", exc)
if __name__ == "__main__":
if __name__ == "__main__":