Refactored the Aodh notifier class
- Included alarm actions to send notification to SO
- Utilizes Aodh's webhook option for alarm_actions
- Included additional tests for this change
- Updated documentation
Change-Id: Ia3f2e2fa2ffee0cc66a80d5098d52b7da2be2dbe
Signed-off-by: Helena McGough <helena.mcgough@intel.com>
diff --git a/doc/MON_install_guide.rst b/doc/MON_install_guide.rst
index 57b79d3..22d4764 100644
--- a/doc/MON_install_guide.rst
+++ b/doc/MON_install_guide.rst
@@ -89,11 +89,17 @@
::
- lxc exec MON - python /root/MON/core/message_bus/common_consumer.py
+ lxc exec MON - python /root/MON/osm_mon/core/message_bus/common_consumer.py
+
+* To enable Aodh alarm notifications to be sent to SO:
+
+ ::
+
+ lxc exec MON - python /root/MON/osm_mon/plugins/OpenStack/Aodh/notifier.py
CloudWatch
~~~~~~~~~~
-The MON container supports a CloudWatch plugin as well.
+The MON container supports a CloudWatch plugin on installation.
Verification
diff --git a/doc/MON_usage_guide.rst b/doc/MON_usage_guide.rst
index 0a28318..89f75fa 100644
--- a/doc/MON_usage_guide.rst
+++ b/doc/MON_usage_guide.rst
@@ -32,12 +32,6 @@
* alarm_request
* metric_request
-In return the plugins will send messages back to the SO with the following
-topics:
-
-* alarm_response
-* metric_response
-
Each type of request has it's own unique key:
* create_alarm_request
* create_metric_request
@@ -50,11 +44,35 @@
* acknowledge_alarm_request
* read_metric_data_request
-Sending Messages
-----------------
+In return the plugins will send messages back to the SO with the following
+topics:
+
+* alarm_response
+* metric_response
+
+Each request has a corresponding response key:
+* create_alarm_reponse
+* create_metric_response
+* list_alarm_response
+* list_metric_response
+* delete_alarm_response
+* delete_metric_response
+* update_alarm_response
+* update_metric_response
+* acknowledge_alarm_response
+* read_metric_data_response
+
+ .. note::
+
+ There is an additional response key to send notifications to the SO
+ when an alarm has been triggered:
+ * notify_alarm
+
+Sending Request Messages
+------------------------
For each of the request message that can be sent there is a json schema defined
in the models directory of the MON repo:
-: `</MON/core/models/>`
+: `</MON/osm_mon/core/models/>`
To send a valid message to the MON module for use by one of the plugins, your
message must match the json schema for that request type.
diff --git a/doc/OpenStack/openstack_plugins.rst b/doc/OpenStack/openstack_plugins.rst
index f67fd17..0e7b07c 100644
--- a/doc/OpenStack/openstack_plugins.rst
+++ b/doc/OpenStack/openstack_plugins.rst
@@ -38,7 +38,7 @@
For plugin specific instructions and configuration options please refer to the
following guide:
-: `<doc/plugins/OpenStack/gnocchi_plugin_guide.rst>`
+: `<doc/OpenStack/gnocchi_plugin_guide.rst>`
Aodh
----
@@ -54,4 +54,4 @@
For plugin specific instructions and configuration options please refer to the
following guide:
-: `<doc/plugins/OpenStack/aodh_plugin_guide.rst>`
+: `<doc/OpenStack/aodh_plugin_guide.rst>`